2019-03-11 21:32:05 +00:00
|
|
|
/*
|
|
|
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
|
|
|
*
|
|
|
|
* Copyright (C) 2018 CERN
|
|
|
|
* @author Jon Evans <jon@craftyjon.com>
|
|
|
|
*
|
|
|
|
* 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, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <list>
|
|
|
|
#include <thread>
|
2019-04-06 01:14:15 +00:00
|
|
|
#include <algorithm>
|
|
|
|
#include <future>
|
2019-04-10 04:16:05 +00:00
|
|
|
#include <vector>
|
2019-03-11 21:32:05 +00:00
|
|
|
#include <unordered_map>
|
|
|
|
#include <profile.h>
|
|
|
|
#include <common.h>
|
|
|
|
#include <erc.h>
|
|
|
|
#include <sch_bus_entry.h>
|
|
|
|
#include <sch_component.h>
|
2019-06-25 23:39:58 +00:00
|
|
|
#include <sch_edit_frame.h>
|
2019-03-11 21:32:05 +00:00
|
|
|
#include <sch_line.h>
|
2019-06-25 23:39:58 +00:00
|
|
|
#include <sch_marker.h>
|
2019-04-03 09:14:36 +00:00
|
|
|
#include <sch_pin.h>
|
2019-03-11 21:32:05 +00:00
|
|
|
#include <sch_sheet.h>
|
|
|
|
#include <sch_sheet_path.h>
|
|
|
|
#include <sch_text.h>
|
2020-05-13 02:00:37 +00:00
|
|
|
#include <schematic.h>
|
2019-03-11 21:32:05 +00:00
|
|
|
#include <connection_graph.h>
|
2020-03-10 18:46:57 +00:00
|
|
|
#include <widgets/ui_common.h>
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-07-06 23:47:07 +00:00
|
|
|
#include <advanced_config.h> // for realtime connectivity switch
|
|
|
|
|
2020-07-06 10:51:04 +00:00
|
|
|
|
2020-07-09 22:14:27 +00:00
|
|
|
/*
|
|
|
|
* Flag to enable connectivity profiling
|
|
|
|
* @ingroup trace_env_vars
|
|
|
|
*/
|
|
|
|
static const wxChar ConnProfileMask[] = wxT( "CONN_PROFILE" );
|
|
|
|
|
|
|
|
|
2019-03-11 21:32:05 +00:00
|
|
|
bool CONNECTION_SUBGRAPH::ResolveDrivers( bool aCreateMarkers )
|
|
|
|
{
|
2020-01-03 03:09:02 +00:00
|
|
|
PRIORITY highest_priority = PRIORITY::INVALID;
|
2019-04-10 04:16:05 +00:00
|
|
|
std::vector<SCH_ITEM*> candidates;
|
|
|
|
std::vector<SCH_ITEM*> strong_drivers;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
m_driver = nullptr;
|
|
|
|
|
2019-03-18 22:38:06 +00:00
|
|
|
// Hierarchical labels are lower priority than local labels here,
|
|
|
|
// because on the first pass we want local labels to drive subgraphs
|
|
|
|
// so that we can identify same-sheet neighbors and link them together.
|
|
|
|
// Hierarchical labels will end up overriding the final net name if
|
|
|
|
// a higher-level sheet has a different name during the hierarchical
|
|
|
|
// pass.
|
|
|
|
|
2020-03-16 11:05:01 +00:00
|
|
|
for( SCH_ITEM* item : m_drivers )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-05-07 01:36:01 +00:00
|
|
|
PRIORITY item_priority = GetDriverPriority( item );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-01-03 03:09:02 +00:00
|
|
|
if( item_priority == PRIORITY::PIN
|
|
|
|
&& !static_cast<SCH_PIN*>( item )->GetParentComponent()->IsInNetlist() )
|
2019-05-07 01:36:01 +00:00
|
|
|
continue;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-01-03 03:09:02 +00:00
|
|
|
if( item_priority >= PRIORITY::HIER_LABEL )
|
2019-04-08 03:54:24 +00:00
|
|
|
strong_drivers.push_back( item );
|
|
|
|
|
2019-03-11 21:32:05 +00:00
|
|
|
if( item_priority > highest_priority )
|
|
|
|
{
|
|
|
|
candidates.clear();
|
|
|
|
candidates.push_back( item );
|
|
|
|
highest_priority = item_priority;
|
|
|
|
}
|
2019-05-05 23:48:43 +00:00
|
|
|
else if( !candidates.empty() && ( item_priority == highest_priority ) )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
|
|
|
candidates.push_back( item );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-03 03:09:02 +00:00
|
|
|
if( highest_priority >= PRIORITY::HIER_LABEL )
|
2019-03-18 22:38:06 +00:00
|
|
|
m_strong_driver = true;
|
|
|
|
|
2019-04-08 03:54:24 +00:00
|
|
|
// Power pins are 5, global labels are 6
|
2020-01-03 03:09:02 +00:00
|
|
|
m_local_driver = ( highest_priority < PRIORITY::POWER_PIN );
|
2019-04-08 03:54:24 +00:00
|
|
|
|
2019-05-05 23:48:43 +00:00
|
|
|
if( !candidates.empty() )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
|
|
|
if( candidates.size() > 1 )
|
|
|
|
{
|
2020-01-03 03:09:02 +00:00
|
|
|
if( highest_priority == PRIORITY::SHEET_PIN )
|
2019-03-18 22:38:06 +00:00
|
|
|
{
|
|
|
|
// We have multiple options, and they are all hierarchical
|
|
|
|
// sheet pins. Let's prefer outputs over inputs.
|
|
|
|
|
|
|
|
for( auto c : candidates )
|
|
|
|
{
|
|
|
|
auto p = static_cast<SCH_SHEET_PIN*>( c );
|
|
|
|
|
2020-01-09 08:14:04 +00:00
|
|
|
if( p->GetShape() == PINSHEETLABEL_SHAPE::PS_OUTPUT )
|
2019-03-18 22:38:06 +00:00
|
|
|
{
|
|
|
|
m_driver = c;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-05-05 23:09:05 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
// For all other driver types, sort by name
|
|
|
|
std::sort( candidates.begin(), candidates.end(),
|
2020-05-25 21:35:26 +00:00
|
|
|
[&]( SCH_ITEM* a, SCH_ITEM* b ) -> bool
|
2019-05-05 23:09:05 +00:00
|
|
|
{
|
2020-05-25 21:35:26 +00:00
|
|
|
SCH_CONNECTION* ac = a->Connection( m_sheet );
|
|
|
|
SCH_CONNECTION* bc = b->Connection( m_sheet );
|
|
|
|
|
|
|
|
// Ensure we don't pick the subset over the superset
|
|
|
|
if( ac->IsBus() && bc->IsBus() )
|
|
|
|
return bc->IsSubsetOf( ac );
|
|
|
|
|
2019-05-05 23:09:05 +00:00
|
|
|
return GetNameForDriver( a ) < GetNameForDriver( b );
|
|
|
|
} );
|
|
|
|
}
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
|
2019-03-18 22:38:06 +00:00
|
|
|
if( !m_driver )
|
|
|
|
m_driver = candidates[0];
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
|
2019-04-08 03:54:24 +00:00
|
|
|
if( strong_drivers.size() > 1 )
|
2019-04-04 02:41:26 +00:00
|
|
|
m_multiple_drivers = true;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-08 03:54:24 +00:00
|
|
|
// Drop weak drivers
|
2019-04-20 01:45:33 +00:00
|
|
|
if( m_strong_driver )
|
|
|
|
m_drivers = strong_drivers;
|
|
|
|
|
|
|
|
// Cache driver connection
|
|
|
|
if( m_driver )
|
|
|
|
m_driver_connection = m_driver->Connection( m_sheet );
|
|
|
|
else
|
|
|
|
m_driver_connection = nullptr;
|
2019-04-08 03:54:24 +00:00
|
|
|
|
2019-04-04 02:41:26 +00:00
|
|
|
if( aCreateMarkers && m_multiple_drivers )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-03-23 19:43:33 +00:00
|
|
|
// First check if all the candidates are actually the same
|
|
|
|
bool same = true;
|
2019-06-01 01:55:43 +00:00
|
|
|
wxString first = GetNameForDriver( candidates[0] );
|
|
|
|
SCH_ITEM* second_item = nullptr;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-03-23 19:43:33 +00:00
|
|
|
for( unsigned i = 1; i < candidates.size(); i++ )
|
|
|
|
{
|
2019-04-04 02:41:26 +00:00
|
|
|
if( GetNameForDriver( candidates[i] ) != first )
|
2019-03-23 19:43:33 +00:00
|
|
|
{
|
2019-06-01 01:55:43 +00:00
|
|
|
second_item = candidates[i];
|
2019-03-23 19:43:33 +00:00
|
|
|
same = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-03-23 19:43:33 +00:00
|
|
|
if( !same )
|
|
|
|
{
|
2020-04-24 13:36:10 +00:00
|
|
|
wxPoint pos = candidates[0]->Type() == SCH_PIN_T ?
|
|
|
|
static_cast<SCH_PIN*>( candidates[0] )->GetTransformedPosition() :
|
|
|
|
candidates[0]->GetPosition();
|
2019-03-23 19:43:33 +00:00
|
|
|
|
2020-06-08 02:19:46 +00:00
|
|
|
ERC_ITEM* ercItem = ERC_ITEM::Create( ERCE_DRIVER_CONFLICT );
|
2020-04-24 13:36:10 +00:00
|
|
|
ercItem->SetItems( candidates[0], second_item );
|
|
|
|
|
|
|
|
SCH_MARKER* marker = new SCH_MARKER( ercItem, pos );
|
2019-03-23 19:43:33 +00:00
|
|
|
m_sheet.LastScreen()->Append( marker );
|
|
|
|
|
|
|
|
// If aCreateMarkers is true, then this is part of ERC check, so we
|
|
|
|
// should return false even if the driver was assigned
|
|
|
|
return false;
|
|
|
|
}
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return aCreateMarkers || ( m_driver != nullptr );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
wxString CONNECTION_SUBGRAPH::GetNetName() const
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
|
|
|
if( !m_driver || m_dirty )
|
|
|
|
return "";
|
|
|
|
|
|
|
|
if( !m_driver->Connection( m_sheet ) )
|
|
|
|
{
|
2020-03-16 11:05:01 +00:00
|
|
|
#ifdef CONNECTIVITY_DEBUG
|
2019-03-11 21:32:05 +00:00
|
|
|
wxASSERT_MSG( false, "Tried to get the net name of an item with no connection" );
|
2020-03-16 11:05:01 +00:00
|
|
|
#endif
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
return "";
|
|
|
|
}
|
|
|
|
|
|
|
|
return m_driver->Connection( m_sheet )->Name();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
std::vector<SCH_ITEM*> CONNECTION_SUBGRAPH::GetBusLabels() const
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-10 04:16:05 +00:00
|
|
|
std::vector<SCH_ITEM*> labels;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-03-16 11:05:01 +00:00
|
|
|
for( SCH_ITEM* item : m_drivers )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
|
|
|
switch( item->Type() )
|
|
|
|
{
|
|
|
|
case SCH_LABEL_T:
|
|
|
|
case SCH_GLOBAL_LABEL_T:
|
|
|
|
{
|
2020-03-16 11:05:01 +00:00
|
|
|
SCH_CONNECTION* label_conn = item->Connection( m_sheet );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
// Only consider bus vectors
|
2020-01-18 20:51:28 +00:00
|
|
|
if( label_conn->Type() == CONNECTION_TYPE::BUS )
|
2019-03-11 21:32:05 +00:00
|
|
|
labels.push_back( item );
|
2020-04-24 23:44:09 +00:00
|
|
|
|
|
|
|
break;
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
2020-04-24 23:44:09 +00:00
|
|
|
|
2019-03-11 21:32:05 +00:00
|
|
|
default: break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return labels;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-07-09 22:14:27 +00:00
|
|
|
const wxString& CONNECTION_SUBGRAPH::GetNameForDriver( SCH_ITEM* aItem )
|
2019-04-04 02:41:26 +00:00
|
|
|
{
|
2020-07-09 22:14:27 +00:00
|
|
|
if( m_driver_name_cache.count( aItem ) )
|
|
|
|
return m_driver_name_cache.at( aItem );
|
2019-04-04 02:41:26 +00:00
|
|
|
|
|
|
|
switch( aItem->Type() )
|
|
|
|
{
|
|
|
|
case SCH_PIN_T:
|
|
|
|
{
|
2020-07-06 10:51:04 +00:00
|
|
|
SCH_PIN* pin = static_cast<SCH_PIN*>( aItem );
|
2020-07-09 22:14:27 +00:00
|
|
|
m_driver_name_cache[aItem] = pin->GetDefaultNetName( m_sheet );
|
2019-04-04 02:41:26 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SCH_LABEL_T:
|
|
|
|
case SCH_GLOBAL_LABEL_T:
|
2019-04-15 23:56:41 +00:00
|
|
|
case SCH_HIER_LABEL_T:
|
2019-04-08 03:54:24 +00:00
|
|
|
case SCH_SHEET_PIN_T:
|
2019-04-04 02:41:26 +00:00
|
|
|
{
|
2020-07-09 22:14:27 +00:00
|
|
|
m_driver_name_cache[aItem] = EscapeString( static_cast<SCH_TEXT*>( aItem )->GetShownText(),
|
|
|
|
CTX_NETNAME );
|
2019-04-04 02:41:26 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
2020-07-09 22:14:27 +00:00
|
|
|
wxFAIL_MSG( "Unhandled item type in GetNameForDriver" );
|
2019-04-04 02:41:26 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2020-07-09 22:14:27 +00:00
|
|
|
return m_driver_name_cache.at( aItem );
|
2019-05-05 23:48:43 +00:00
|
|
|
}
|
2019-04-04 02:41:26 +00:00
|
|
|
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
void CONNECTION_SUBGRAPH::Absorb( CONNECTION_SUBGRAPH* aOther )
|
|
|
|
{
|
|
|
|
wxASSERT( m_sheet == aOther->m_sheet );
|
|
|
|
|
|
|
|
for( SCH_ITEM* item : aOther->m_items )
|
|
|
|
{
|
|
|
|
item->Connection( m_sheet )->SetSubgraphCode( m_code );
|
|
|
|
AddItem( item );
|
|
|
|
}
|
|
|
|
|
|
|
|
m_bus_neighbors.insert( aOther->m_bus_neighbors.begin(), aOther->m_bus_neighbors.end() );
|
2019-05-05 23:48:43 +00:00
|
|
|
m_bus_parents.insert( aOther->m_bus_parents.begin(), aOther->m_bus_parents.end() );
|
2019-04-20 01:45:33 +00:00
|
|
|
|
2020-01-04 15:38:43 +00:00
|
|
|
m_multiple_drivers |= aOther->m_multiple_drivers;
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
aOther->m_absorbed = true;
|
|
|
|
aOther->m_dirty = false;
|
|
|
|
aOther->m_driver = nullptr;
|
|
|
|
aOther->m_driver_connection = nullptr;
|
2019-05-05 23:48:43 +00:00
|
|
|
aOther->m_absorbed_by = this;
|
2019-04-20 01:45:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void CONNECTION_SUBGRAPH::AddItem( SCH_ITEM* aItem )
|
|
|
|
{
|
|
|
|
m_items.push_back( aItem );
|
|
|
|
|
|
|
|
if( aItem->Connection( m_sheet )->IsDriver() )
|
|
|
|
m_drivers.push_back( aItem );
|
|
|
|
|
|
|
|
if( aItem->Type() == SCH_SHEET_PIN_T )
|
|
|
|
m_hier_pins.push_back( static_cast<SCH_SHEET_PIN*>( aItem ) );
|
|
|
|
else if( aItem->Type() == SCH_HIER_LABEL_T )
|
|
|
|
m_hier_ports.push_back( static_cast<SCH_HIERLABEL*>( aItem ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void CONNECTION_SUBGRAPH::UpdateItemConnections()
|
|
|
|
{
|
|
|
|
if( !m_driver_connection )
|
|
|
|
return;
|
|
|
|
|
2020-03-16 11:05:01 +00:00
|
|
|
for( SCH_ITEM* item : m_items )
|
2019-04-20 01:45:33 +00:00
|
|
|
{
|
2020-03-16 11:05:01 +00:00
|
|
|
SCH_CONNECTION* item_conn = item->Connection( m_sheet );
|
2019-04-20 01:45:33 +00:00
|
|
|
|
|
|
|
if( !item_conn )
|
2020-06-30 00:27:08 +00:00
|
|
|
item_conn = item->InitializeConnection( m_sheet, m_graph );
|
2019-04-20 01:45:33 +00:00
|
|
|
|
|
|
|
if( ( m_driver_connection->IsBus() && item_conn->IsNet() ) ||
|
|
|
|
( m_driver_connection->IsNet() && item_conn->IsBus() ) )
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( item != m_driver )
|
|
|
|
{
|
|
|
|
item_conn->Clone( *m_driver_connection );
|
|
|
|
item_conn->ClearDirty();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-05-07 01:36:01 +00:00
|
|
|
CONNECTION_SUBGRAPH::PRIORITY CONNECTION_SUBGRAPH::GetDriverPriority( SCH_ITEM* aDriver )
|
|
|
|
{
|
|
|
|
if( !aDriver )
|
2020-01-03 03:09:02 +00:00
|
|
|
return PRIORITY::NONE;
|
2019-05-07 01:36:01 +00:00
|
|
|
|
|
|
|
switch( aDriver->Type() )
|
|
|
|
{
|
2020-01-03 03:09:02 +00:00
|
|
|
case SCH_SHEET_PIN_T: return PRIORITY::SHEET_PIN;
|
|
|
|
case SCH_HIER_LABEL_T: return PRIORITY::HIER_LABEL;
|
|
|
|
case SCH_LABEL_T: return PRIORITY::LOCAL_LABEL;
|
|
|
|
case SCH_GLOBAL_LABEL_T: return PRIORITY::GLOBAL;
|
2019-05-07 01:36:01 +00:00
|
|
|
case SCH_PIN_T:
|
|
|
|
{
|
|
|
|
auto sch_pin = static_cast<SCH_PIN*>( aDriver );
|
|
|
|
|
|
|
|
if( sch_pin->IsPowerConnection() )
|
2020-01-03 03:09:02 +00:00
|
|
|
return PRIORITY::POWER_PIN;
|
2019-05-07 01:36:01 +00:00
|
|
|
else
|
2020-01-03 03:09:02 +00:00
|
|
|
return PRIORITY::PIN;
|
2019-05-07 01:36:01 +00:00
|
|
|
}
|
|
|
|
|
2020-01-03 03:09:02 +00:00
|
|
|
default: return PRIORITY::NONE;
|
2019-05-07 01:36:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-04-29 21:44:49 +00:00
|
|
|
bool CONNECTION_GRAPH::m_allowRealTime = true;
|
|
|
|
|
|
|
|
|
2019-03-11 21:32:05 +00:00
|
|
|
void CONNECTION_GRAPH::Reset()
|
|
|
|
{
|
2020-01-07 05:12:37 +00:00
|
|
|
for( auto& subgraph : m_subgraphs )
|
2019-04-20 01:45:33 +00:00
|
|
|
delete subgraph;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
m_items.clear();
|
|
|
|
m_subgraphs.clear();
|
2019-04-25 04:37:10 +00:00
|
|
|
m_driver_subgraphs.clear();
|
2019-04-29 23:41:03 +00:00
|
|
|
m_sheet_to_subgraphs_map.clear();
|
2019-03-11 21:32:05 +00:00
|
|
|
m_invisible_power_pins.clear();
|
|
|
|
m_bus_alias_cache.clear();
|
|
|
|
m_net_name_to_code_map.clear();
|
|
|
|
m_bus_name_to_code_map.clear();
|
|
|
|
m_net_code_to_subgraphs_map.clear();
|
2019-04-25 03:47:57 +00:00
|
|
|
m_net_name_to_subgraphs_map.clear();
|
2020-05-24 14:46:05 +00:00
|
|
|
m_item_to_subgraph_map.clear();
|
2019-04-25 19:31:44 +00:00
|
|
|
m_local_label_cache.clear();
|
|
|
|
m_global_label_cache.clear();
|
2019-03-11 21:32:05 +00:00
|
|
|
m_last_net_code = 1;
|
|
|
|
m_last_bus_code = 1;
|
|
|
|
m_last_subgraph_code = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-01-12 18:40:50 +00:00
|
|
|
void CONNECTION_GRAPH::Recalculate( const SCH_SHEET_LIST& aSheetList, bool aUnconditional )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2020-07-09 22:14:27 +00:00
|
|
|
PROF_COUNTER recalc_time( "CONNECTION_GRAPH::Recalculate" );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-03-30 15:57:30 +00:00
|
|
|
if( aUnconditional )
|
|
|
|
Reset();
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-07-09 22:14:27 +00:00
|
|
|
PROF_COUNTER update_items( "updateItemConnectivity" );
|
|
|
|
|
2020-01-12 18:40:50 +00:00
|
|
|
for( const SCH_SHEET_PATH& sheet : aSheetList )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-11 03:05:23 +00:00
|
|
|
std::vector<SCH_ITEM*> items;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-07-09 22:14:27 +00:00
|
|
|
for( SCH_ITEM* item : sheet.LastScreen()->Items() )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-06-25 23:39:58 +00:00
|
|
|
if( item->IsConnectable() && ( aUnconditional || item->IsConnectivityDirty() ) )
|
2019-04-11 03:05:23 +00:00
|
|
|
items.push_back( item );
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
|
2020-07-09 22:14:27 +00:00
|
|
|
m_items.reserve( m_items.size() + items.size() );
|
|
|
|
|
2019-04-11 03:05:23 +00:00
|
|
|
updateItemConnectivity( sheet, items );
|
2020-01-17 02:33:16 +00:00
|
|
|
|
|
|
|
// UpdateDanglingState() also adds connected items for SCH_TEXT
|
|
|
|
sheet.LastScreen()->TestDanglingEnds( &sheet );
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
|
2020-07-09 22:14:27 +00:00
|
|
|
if( wxLog::IsAllowedTraceMask( ConnProfileMask ) )
|
|
|
|
update_items.Show();
|
2019-04-03 02:58:11 +00:00
|
|
|
|
2020-07-09 22:14:27 +00:00
|
|
|
PROF_COUNTER build_graph( "buildConnectionGraph" );
|
2019-04-29 21:44:49 +00:00
|
|
|
|
2019-03-11 21:32:05 +00:00
|
|
|
buildConnectionGraph();
|
2019-04-29 21:44:49 +00:00
|
|
|
|
2020-07-09 22:14:27 +00:00
|
|
|
if( wxLog::IsAllowedTraceMask( ConnProfileMask ) )
|
|
|
|
build_graph.Show();
|
2019-04-29 21:44:49 +00:00
|
|
|
|
|
|
|
recalc_time.Stop();
|
2020-07-09 22:14:27 +00:00
|
|
|
|
|
|
|
if( wxLog::IsAllowedTraceMask( ConnProfileMask ) )
|
|
|
|
recalc_time.Show();
|
2019-04-29 21:44:49 +00:00
|
|
|
|
|
|
|
#ifndef DEBUG
|
|
|
|
// Pressure relief valve for release builds
|
|
|
|
const double max_recalc_time_msecs = 250.;
|
|
|
|
|
|
|
|
if( m_allowRealTime && ADVANCED_CFG::GetCfg().m_realTimeConnectivity &&
|
|
|
|
recalc_time.msecs() > max_recalc_time_msecs )
|
|
|
|
{
|
|
|
|
m_allowRealTime = false;
|
|
|
|
}
|
|
|
|
#endif
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-07-08 21:42:05 +00:00
|
|
|
void CONNECTION_GRAPH::updateItemConnectivity( const SCH_SHEET_PATH& aSheet,
|
2020-01-12 18:40:50 +00:00
|
|
|
const std::vector<SCH_ITEM*>& aItemList )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2020-07-09 22:14:27 +00:00
|
|
|
std::map< wxPoint, std::vector<SCH_ITEM*> > connection_map;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-03-16 11:05:01 +00:00
|
|
|
for( SCH_ITEM* item : aItemList )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-10 04:16:05 +00:00
|
|
|
std::vector< wxPoint > points;
|
2019-03-11 21:32:05 +00:00
|
|
|
item->GetConnectionPoints( points );
|
2020-01-17 02:33:16 +00:00
|
|
|
item->ConnectedItems( aSheet ).clear();
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
if( item->Type() == SCH_SHEET_T )
|
|
|
|
{
|
2020-01-12 18:40:50 +00:00
|
|
|
for( SCH_SHEET_PIN* pin : static_cast<SCH_SHEET*>( item )->GetPins() )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2020-01-12 18:40:50 +00:00
|
|
|
if( !pin->Connection( aSheet ) )
|
2020-06-30 00:27:08 +00:00
|
|
|
pin->InitializeConnection( aSheet, this );
|
2019-04-11 03:05:23 +00:00
|
|
|
|
2020-01-17 02:33:16 +00:00
|
|
|
pin->ConnectedItems( aSheet ).clear();
|
2020-01-12 18:40:50 +00:00
|
|
|
pin->Connection( aSheet )->Reset();
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-01-12 18:40:50 +00:00
|
|
|
connection_map[ pin->GetTextPos() ].push_back( pin );
|
2020-07-09 22:14:27 +00:00
|
|
|
m_items.emplace_back( pin );
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else if( item->Type() == SCH_COMPONENT_T )
|
|
|
|
{
|
2019-04-22 10:14:47 +00:00
|
|
|
SCH_COMPONENT* component = static_cast<SCH_COMPONENT*>( item );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-01-17 02:33:16 +00:00
|
|
|
// TODO(JE) right now this relies on GetSchPins() returning good SCH_PIN pointers
|
|
|
|
// that contain good LIB_PIN pointers. Since these get invalidated whenever the
|
|
|
|
// library component is refreshed, the current solution as of ed025972 is to just
|
|
|
|
// rebuild the SCH_PIN list when the component is refreshed, and then re-run the
|
|
|
|
// connectivity calculations. This is slow and should be improved before release.
|
|
|
|
// See https://gitlab.com/kicad/code/kicad/issues/3784
|
2019-04-11 03:05:23 +00:00
|
|
|
|
2020-01-17 02:33:16 +00:00
|
|
|
for( SCH_PIN* pin : component->GetSchPins( &aSheet ) )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2020-06-30 00:27:08 +00:00
|
|
|
pin->InitializeConnection( aSheet, this );
|
2019-04-23 02:49:24 +00:00
|
|
|
|
2020-04-24 13:36:10 +00:00
|
|
|
wxPoint pos = pin->GetPosition();
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
// because calling the first time is not thread-safe
|
2020-01-17 02:33:16 +00:00
|
|
|
pin->GetDefaultNetName( aSheet );
|
|
|
|
pin->ConnectedItems( aSheet ).clear();
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-08 01:33:47 +00:00
|
|
|
// Invisible power pins need to be post-processed later
|
|
|
|
|
2020-01-17 02:33:16 +00:00
|
|
|
if( pin->IsPowerConnection() && !pin->IsVisible() )
|
|
|
|
m_invisible_power_pins.emplace_back( std::make_pair( aSheet, pin ) );
|
2019-04-08 01:33:47 +00:00
|
|
|
|
2020-01-17 02:33:16 +00:00
|
|
|
connection_map[ pos ].push_back( pin );
|
2020-07-09 22:14:27 +00:00
|
|
|
m_items.emplace_back( pin );
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2020-07-09 22:14:27 +00:00
|
|
|
m_items.emplace_back( item );
|
2020-06-30 00:27:08 +00:00
|
|
|
auto conn = item->InitializeConnection( aSheet, this );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
// Set bus/net property here so that the propagation code uses it
|
|
|
|
switch( item->Type() )
|
|
|
|
{
|
|
|
|
case SCH_LINE_T:
|
2020-01-18 20:51:28 +00:00
|
|
|
conn->SetType( item->GetLayer() == LAYER_BUS ? CONNECTION_TYPE::BUS :
|
|
|
|
CONNECTION_TYPE::NET );
|
2019-03-11 21:32:05 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SCH_BUS_BUS_ENTRY_T:
|
2020-01-18 20:51:28 +00:00
|
|
|
conn->SetType( CONNECTION_TYPE::BUS );
|
2019-12-23 13:55:47 +00:00
|
|
|
// clean previous (old) links:
|
|
|
|
static_cast<SCH_BUS_BUS_ENTRY*>( item )->m_connected_bus_items[0] = nullptr;
|
|
|
|
static_cast<SCH_BUS_BUS_ENTRY*>( item )->m_connected_bus_items[1] = nullptr;
|
2019-03-11 21:32:05 +00:00
|
|
|
break;
|
|
|
|
|
2019-04-03 09:14:36 +00:00
|
|
|
case SCH_PIN_T:
|
2020-01-18 20:51:28 +00:00
|
|
|
conn->SetType( CONNECTION_TYPE::NET );
|
2019-12-23 13:55:47 +00:00
|
|
|
break;
|
|
|
|
|
2019-03-11 21:32:05 +00:00
|
|
|
case SCH_BUS_WIRE_ENTRY_T:
|
2020-01-18 20:51:28 +00:00
|
|
|
conn->SetType( CONNECTION_TYPE::NET );
|
2019-12-23 13:55:47 +00:00
|
|
|
// clean previous (old) link:
|
|
|
|
static_cast<SCH_BUS_WIRE_ENTRY*>( item )->m_connected_bus_item = nullptr;
|
2019-03-11 21:32:05 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2020-03-16 11:05:01 +00:00
|
|
|
for( const wxPoint& point : points )
|
2019-04-11 03:05:23 +00:00
|
|
|
connection_map[ point ].push_back( item );
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
2019-03-30 15:57:30 +00:00
|
|
|
|
|
|
|
item->SetConnectivityDirty( false );
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
|
2019-04-11 03:05:23 +00:00
|
|
|
for( const auto& it : connection_map )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-11 03:05:23 +00:00
|
|
|
auto connection_vec = it.second;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-11 03:05:23 +00:00
|
|
|
for( auto primary_it = connection_vec.begin(); primary_it != connection_vec.end(); primary_it++ )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2020-03-16 11:05:01 +00:00
|
|
|
SCH_ITEM* connected_item = *primary_it;
|
2019-04-06 01:14:15 +00:00
|
|
|
|
2019-03-11 21:32:05 +00:00
|
|
|
// Bus entries are special: they can have connection points in the
|
|
|
|
// middle of a wire segment, because the junction algo doesn't split
|
|
|
|
// the segment in two where you place a bus entry. This means that
|
|
|
|
// bus entries that don't land on the end of a line segment need to
|
|
|
|
// have "virtual" connection points to the segments they graphically
|
|
|
|
// touch.
|
|
|
|
if( connected_item->Type() == SCH_BUS_WIRE_ENTRY_T )
|
|
|
|
{
|
|
|
|
// If this location only has the connection point of the bus
|
|
|
|
// entry itself, this means that either the bus entry is not
|
|
|
|
// connected to anything graphically, or that it is connected to
|
|
|
|
// a segment at some point other than at one of the endpoints.
|
2019-04-11 03:05:23 +00:00
|
|
|
if( connection_vec.size() == 1 )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2020-03-16 11:05:01 +00:00
|
|
|
SCH_SCREEN* screen = aSheet.LastScreen();
|
|
|
|
SCH_LINE* bus = screen->GetBus( it.first );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
if( bus )
|
|
|
|
{
|
|
|
|
auto bus_entry = static_cast<SCH_BUS_WIRE_ENTRY*>( connected_item );
|
|
|
|
bus_entry->m_connected_bus_item = bus;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Bus-to-bus entries are treated just like bus wires
|
2020-04-23 01:33:57 +00:00
|
|
|
else if( connected_item->Type() == SCH_BUS_BUS_ENTRY_T )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-11 03:05:23 +00:00
|
|
|
if( connection_vec.size() < 2 )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2020-03-16 11:05:01 +00:00
|
|
|
SCH_SCREEN* screen = aSheet.LastScreen();
|
|
|
|
SCH_LINE* bus = screen->GetBus( it.first );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
if( bus )
|
|
|
|
{
|
|
|
|
auto bus_entry = static_cast<SCH_BUS_BUS_ENTRY*>( connected_item );
|
|
|
|
|
2019-04-11 03:05:23 +00:00
|
|
|
if( it.first == bus_entry->GetPosition() )
|
2019-03-11 21:32:05 +00:00
|
|
|
bus_entry->m_connected_bus_items[0] = bus;
|
|
|
|
else
|
|
|
|
bus_entry->m_connected_bus_items[1] = bus;
|
|
|
|
|
2020-01-17 02:33:16 +00:00
|
|
|
bus_entry->ConnectedItems( aSheet ).insert( bus );
|
|
|
|
bus->ConnectedItems( aSheet ).insert( bus_entry );
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-04-23 01:33:57 +00:00
|
|
|
// Change junctions to be on bus junction layer if they are touching a bus
|
|
|
|
else if( connected_item->Type() == SCH_JUNCTION_T )
|
|
|
|
{
|
|
|
|
SCH_SCREEN* screen = aSheet.LastScreen();
|
|
|
|
SCH_LINE* bus = screen->GetBus( it.first );
|
|
|
|
|
|
|
|
connected_item->SetLayer( bus ? LAYER_BUS_JUNCTION : LAYER_JUNCTION );
|
|
|
|
}
|
|
|
|
|
2019-04-11 03:05:23 +00:00
|
|
|
for( auto test_it = primary_it + 1; test_it != connection_vec.end(); test_it++ )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-11 03:05:23 +00:00
|
|
|
auto test_item = *test_it;
|
2019-04-06 01:14:15 +00:00
|
|
|
|
2019-04-11 03:05:23 +00:00
|
|
|
if( connected_item != test_item &&
|
2019-03-11 21:32:05 +00:00
|
|
|
connected_item->ConnectionPropagatesTo( test_item ) &&
|
|
|
|
test_item->ConnectionPropagatesTo( connected_item ) )
|
|
|
|
{
|
2020-01-17 02:33:16 +00:00
|
|
|
connected_item->ConnectedItems( aSheet ).insert( test_item );
|
|
|
|
test_item->ConnectedItems( aSheet ).insert( connected_item );
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
|
2019-03-23 19:43:33 +00:00
|
|
|
// Set up the link between the bus entry net and the bus
|
2019-03-11 21:32:05 +00:00
|
|
|
if( connected_item->Type() == SCH_BUS_WIRE_ENTRY_T )
|
|
|
|
{
|
|
|
|
if( test_item->Connection( aSheet )->IsBus() )
|
|
|
|
{
|
|
|
|
auto bus_entry = static_cast<SCH_BUS_WIRE_ENTRY*>( connected_item );
|
|
|
|
bus_entry->m_connected_bus_item = test_item;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-04-12 03:38:32 +00:00
|
|
|
|
|
|
|
// If we got this far and did not find a connected bus item for a bus entry,
|
|
|
|
// we should do a manual scan in case there is a bus item on this connection
|
|
|
|
// point but we didn't pick it up earlier because there is *also* a net item here.
|
|
|
|
if( connected_item->Type() == SCH_BUS_WIRE_ENTRY_T )
|
|
|
|
{
|
|
|
|
auto bus_entry = static_cast<SCH_BUS_WIRE_ENTRY*>( connected_item );
|
|
|
|
|
|
|
|
if( !bus_entry->m_connected_bus_item )
|
|
|
|
{
|
|
|
|
auto screen = aSheet.LastScreen();
|
|
|
|
auto bus = screen->GetBus( it.first );
|
|
|
|
|
|
|
|
if( bus )
|
|
|
|
bus_entry->m_connected_bus_item = bus;
|
|
|
|
}
|
|
|
|
}
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// TODO(JE) This won't give the same subgraph IDs (and eventually net/graph codes)
|
|
|
|
// to the same subgraph necessarily if it runs over and over again on the same
|
|
|
|
// sheet. We need:
|
|
|
|
//
|
|
|
|
// a) a cache of net/bus codes, like used before
|
|
|
|
// b) to persist the CONNECTION_GRAPH globally so the cache is persistent,
|
|
|
|
// c) some way of trying to avoid changing net names. so we should keep track
|
|
|
|
// of the previous driver of a net, and if it comes down to choosing between
|
|
|
|
// equally-prioritized drivers, choose the one that already exists as a driver
|
|
|
|
// on some portion of the items.
|
|
|
|
|
|
|
|
|
|
|
|
void CONNECTION_GRAPH::buildConnectionGraph()
|
|
|
|
{
|
|
|
|
// Recache all bus aliases for later use
|
2020-05-13 02:00:37 +00:00
|
|
|
wxCHECK_RET( m_schematic, "Connection graph cannot be built without schematic pointer" );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-05-13 02:00:37 +00:00
|
|
|
SCH_SHEET_LIST all_sheets = m_schematic->GetSheets();
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
for( unsigned i = 0; i < all_sheets.size(); i++ )
|
|
|
|
{
|
2019-05-05 23:48:43 +00:00
|
|
|
for( const auto& alias : all_sheets[i].LastScreen()->GetBusAliases() )
|
2019-03-11 21:32:05 +00:00
|
|
|
m_bus_alias_cache[ alias->GetName() ] = alias;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Build subgraphs from items (on a per-sheet basis)
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
for( SCH_ITEM* item : m_items )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-20 01:45:33 +00:00
|
|
|
for( const auto& it : item->m_connection_map )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
|
|
|
const auto sheet = it.first;
|
|
|
|
auto connection = it.second;
|
|
|
|
|
|
|
|
if( connection->SubgraphCode() == 0 )
|
|
|
|
{
|
2020-05-13 02:00:37 +00:00
|
|
|
auto subgraph = new CONNECTION_SUBGRAPH( this );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
subgraph->m_code = m_last_subgraph_code++;
|
|
|
|
subgraph->m_sheet = sheet;
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
subgraph->AddItem( item );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-04 01:47:26 +00:00
|
|
|
connection->SetSubgraphCode( subgraph->m_code );
|
2020-05-24 14:46:05 +00:00
|
|
|
m_item_to_subgraph_map[item] = subgraph;
|
2019-04-04 01:47:26 +00:00
|
|
|
|
2019-04-06 01:14:15 +00:00
|
|
|
std::list<SCH_ITEM*> members;
|
|
|
|
|
2020-05-13 02:00:37 +00:00
|
|
|
auto get_items =
|
|
|
|
[&]( SCH_ITEM* aItem ) -> bool
|
|
|
|
{
|
|
|
|
auto* conn = aItem->Connection( sheet );
|
2019-04-06 01:14:15 +00:00
|
|
|
|
2020-05-13 02:00:37 +00:00
|
|
|
if( !conn )
|
2020-06-30 00:27:08 +00:00
|
|
|
conn = aItem->InitializeConnection( sheet, this );
|
2019-04-06 01:14:15 +00:00
|
|
|
|
2020-05-13 02:00:37 +00:00
|
|
|
return ( conn->SubgraphCode() == 0 );
|
|
|
|
};
|
2019-04-06 01:14:15 +00:00
|
|
|
|
2020-01-17 02:33:16 +00:00
|
|
|
std::copy_if( item->ConnectedItems( sheet ).begin(),
|
|
|
|
item->ConnectedItems( sheet ).end(),
|
2019-04-06 01:14:15 +00:00
|
|
|
std::back_inserter( members ), get_items );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
for( auto connected_item : members )
|
|
|
|
{
|
|
|
|
if( connected_item->Type() == SCH_NO_CONNECT_T )
|
|
|
|
subgraph->m_no_connect = connected_item;
|
|
|
|
|
|
|
|
auto connected_conn = connected_item->Connection( sheet );
|
|
|
|
|
|
|
|
wxASSERT( connected_conn );
|
|
|
|
|
|
|
|
if( connected_conn->SubgraphCode() == 0 )
|
|
|
|
{
|
|
|
|
connected_conn->SetSubgraphCode( subgraph->m_code );
|
2020-05-24 14:46:05 +00:00
|
|
|
m_item_to_subgraph_map[connected_item] = subgraph;
|
2019-05-05 23:48:43 +00:00
|
|
|
subgraph->AddItem( connected_item );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-01-17 02:33:16 +00:00
|
|
|
std::copy_if( connected_item->ConnectedItems( sheet ).begin(),
|
|
|
|
connected_item->ConnectedItems( sheet ).end(),
|
2019-04-06 01:14:15 +00:00
|
|
|
std::back_inserter( members ), get_items );
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
subgraph->m_dirty = true;
|
|
|
|
m_subgraphs.push_back( subgraph );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* TODO(JE)
|
|
|
|
*
|
|
|
|
* It would be good if net codes were preserved as much as possible when
|
|
|
|
* generating netlists, so that unnamed nets don't keep shifting around when
|
|
|
|
* you regenerate.
|
|
|
|
*
|
|
|
|
* Right now, we are clearing out the old connections up in
|
|
|
|
* UpdateItemConnectivity(), but that is useful information, so maybe we
|
|
|
|
* need to just set the dirty flag or something.
|
|
|
|
*
|
|
|
|
* That way, ResolveDrivers() can check what the driver of the subgraph was
|
|
|
|
* previously, and if it is in the situation of choosing between equal
|
|
|
|
* candidates for an auto-generated net name, pick the previous one.
|
|
|
|
*
|
|
|
|
* N.B. the old algorithm solves this by sorting the possible net names
|
|
|
|
* alphabetically, so as long as the same refdes components are involved,
|
|
|
|
* the net will be the same.
|
|
|
|
*/
|
|
|
|
|
|
|
|
// Resolve drivers for subgraphs and propagate connectivity info
|
|
|
|
|
2019-04-11 03:05:23 +00:00
|
|
|
// We don't want to spin up a new thread for fewer than 8 nets (overhead costs)
|
2019-04-06 01:14:15 +00:00
|
|
|
size_t parallelThreadCount = std::min<size_t>( std::thread::hardware_concurrency(),
|
2019-04-10 04:00:11 +00:00
|
|
|
( m_subgraphs.size() + 3 ) / 4 );
|
2019-04-06 01:14:15 +00:00
|
|
|
|
2019-03-11 21:32:05 +00:00
|
|
|
std::atomic<size_t> nextSubgraph( 0 );
|
2019-04-06 01:14:15 +00:00
|
|
|
std::vector<std::future<size_t>> returns( parallelThreadCount );
|
|
|
|
std::vector<CONNECTION_SUBGRAPH*> dirty_graphs;
|
|
|
|
|
|
|
|
std::copy_if( m_subgraphs.begin(), m_subgraphs.end(), std::back_inserter( dirty_graphs ),
|
2020-03-16 11:05:01 +00:00
|
|
|
[&] ( const CONNECTION_SUBGRAPH* candidate )
|
|
|
|
{
|
2019-04-20 01:45:33 +00:00
|
|
|
return candidate->m_dirty;
|
|
|
|
} );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-06 01:14:15 +00:00
|
|
|
auto update_lambda = [&nextSubgraph, &dirty_graphs]() -> size_t
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-06 01:14:15 +00:00
|
|
|
for( size_t subgraphId = nextSubgraph++; subgraphId < dirty_graphs.size(); subgraphId = nextSubgraph++ )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-06 01:14:15 +00:00
|
|
|
auto subgraph = dirty_graphs[subgraphId];
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-06 01:14:15 +00:00
|
|
|
if( !subgraph->m_dirty )
|
|
|
|
continue;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-06 01:14:15 +00:00
|
|
|
// Special processing for some items
|
|
|
|
for( auto item : subgraph->m_items )
|
|
|
|
{
|
|
|
|
switch( item->Type() )
|
2019-04-04 01:47:26 +00:00
|
|
|
{
|
2019-04-06 01:14:15 +00:00
|
|
|
case SCH_NO_CONNECT_T:
|
|
|
|
subgraph->m_no_connect = item;
|
|
|
|
break;
|
2019-04-04 01:47:26 +00:00
|
|
|
|
2019-04-06 01:14:15 +00:00
|
|
|
case SCH_BUS_WIRE_ENTRY_T:
|
|
|
|
subgraph->m_bus_entry = item;
|
|
|
|
break;
|
2019-04-04 01:47:26 +00:00
|
|
|
|
2019-04-06 01:14:15 +00:00
|
|
|
case SCH_PIN_T:
|
|
|
|
{
|
|
|
|
auto pin = static_cast<SCH_PIN*>( item );
|
2019-04-04 01:47:26 +00:00
|
|
|
|
2020-01-18 20:51:28 +00:00
|
|
|
if( pin->GetType() == ELECTRICAL_PINTYPE::PT_NC )
|
2019-04-06 01:14:15 +00:00
|
|
|
subgraph->m_no_connect = item;
|
2019-04-04 01:47:26 +00:00
|
|
|
|
2019-04-06 01:14:15 +00:00
|
|
|
break;
|
|
|
|
}
|
2019-04-04 01:47:26 +00:00
|
|
|
|
2019-04-06 01:14:15 +00:00
|
|
|
default:
|
|
|
|
break;
|
2019-04-04 01:47:26 +00:00
|
|
|
}
|
2019-04-06 01:14:15 +00:00
|
|
|
}
|
2019-04-04 01:47:26 +00:00
|
|
|
|
2019-04-06 01:14:15 +00:00
|
|
|
if( !subgraph->ResolveDrivers() )
|
|
|
|
{
|
|
|
|
subgraph->m_dirty = false;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Now the subgraph has only one driver
|
2019-04-25 03:47:57 +00:00
|
|
|
SCH_ITEM* driver = subgraph->m_driver;
|
|
|
|
SCH_SHEET_PATH sheet = subgraph->m_sheet;
|
|
|
|
SCH_CONNECTION* connection = driver->Connection( sheet );
|
2019-04-06 01:14:15 +00:00
|
|
|
|
2020-07-09 22:14:27 +00:00
|
|
|
connection->ConfigureFromLabel( subgraph->GetNameForDriver( driver ) );
|
2019-04-06 01:14:15 +00:00
|
|
|
connection->SetDriver( driver );
|
|
|
|
connection->ClearDirty();
|
2019-03-28 03:36:35 +00:00
|
|
|
|
2019-04-06 01:14:15 +00:00
|
|
|
subgraph->m_dirty = false;
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
2019-04-06 01:14:15 +00:00
|
|
|
}
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-06 01:14:15 +00:00
|
|
|
return 1;
|
|
|
|
};
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-06 01:14:15 +00:00
|
|
|
if( parallelThreadCount == 1 )
|
|
|
|
update_lambda();
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for( size_t ii = 0; ii < parallelThreadCount; ++ii )
|
|
|
|
returns[ii] = std::async( std::launch::async, update_lambda );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-06 01:14:15 +00:00
|
|
|
// Finalize the threads
|
|
|
|
for( size_t ii = 0; ii < parallelThreadCount; ++ii )
|
|
|
|
returns[ii].wait();
|
|
|
|
}
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-25 03:47:57 +00:00
|
|
|
// Now discard any non-driven subgraphs from further consideration
|
|
|
|
|
2019-04-25 04:37:10 +00:00
|
|
|
std::copy_if( m_subgraphs.begin(), m_subgraphs.end(), std::back_inserter( m_driver_subgraphs ),
|
2020-03-16 11:05:01 +00:00
|
|
|
[&] ( const CONNECTION_SUBGRAPH* candidate ) -> bool
|
|
|
|
{
|
|
|
|
return candidate->m_driver;
|
2019-04-25 03:47:57 +00:00
|
|
|
} );
|
|
|
|
|
2019-03-18 22:38:06 +00:00
|
|
|
// Check for subgraphs with the same net name but only weak drivers.
|
|
|
|
// For example, two wires that are both connected to hierarchical
|
|
|
|
// sheet pins that happen to have the same name, but are not the same.
|
|
|
|
|
2019-04-25 04:37:10 +00:00
|
|
|
for( auto&& subgraph : m_driver_subgraphs )
|
2019-03-28 03:36:35 +00:00
|
|
|
{
|
2019-04-25 03:47:57 +00:00
|
|
|
wxString full_name = subgraph->m_driver_connection->Name();
|
|
|
|
wxString name = subgraph->m_driver_connection->Name( true );
|
|
|
|
m_net_name_to_subgraphs_map[full_name].emplace_back( subgraph );
|
|
|
|
|
|
|
|
subgraph->m_dirty = true;
|
|
|
|
|
2019-03-28 03:36:35 +00:00
|
|
|
if( subgraph->m_strong_driver )
|
|
|
|
{
|
2019-04-25 03:47:57 +00:00
|
|
|
SCH_ITEM* driver = subgraph->m_driver;
|
|
|
|
SCH_SHEET_PATH sheet = subgraph->m_sheet;
|
2019-03-28 03:36:35 +00:00
|
|
|
|
|
|
|
switch( driver->Type() )
|
|
|
|
{
|
|
|
|
case SCH_LABEL_T:
|
2019-04-15 23:56:41 +00:00
|
|
|
case SCH_HIER_LABEL_T:
|
2019-03-28 03:36:35 +00:00
|
|
|
{
|
|
|
|
m_local_label_cache[std::make_pair( sheet, name )].push_back( subgraph );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case SCH_GLOBAL_LABEL_T:
|
|
|
|
{
|
|
|
|
m_global_label_cache[name].push_back( subgraph );
|
|
|
|
break;
|
|
|
|
}
|
2019-04-03 09:14:36 +00:00
|
|
|
case SCH_PIN_T:
|
2019-03-28 03:36:35 +00:00
|
|
|
{
|
2019-04-03 09:14:36 +00:00
|
|
|
auto pin = static_cast<SCH_PIN*>( driver );
|
|
|
|
wxASSERT( pin->IsPowerConnection() );
|
2019-03-28 03:36:35 +00:00
|
|
|
m_global_label_cache[name].push_back( subgraph );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
2019-04-03 02:58:11 +00:00
|
|
|
wxLogTrace( "CONN", "Unexpected strong driver %s",
|
2019-12-20 14:11:39 +00:00
|
|
|
driver->GetSelectMenuText( EDA_UNITS::MILLIMETRES ) );
|
2019-03-28 03:36:35 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
// Generate subgraphs for invisible power pins. These will be merged with other subgraphs
|
|
|
|
// on the same sheet in the next loop.
|
|
|
|
|
|
|
|
std::unordered_map<int, CONNECTION_SUBGRAPH*> invisible_pin_subgraphs;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
for( const auto& it : m_invisible_power_pins )
|
|
|
|
{
|
2020-01-17 02:33:16 +00:00
|
|
|
SCH_SHEET_PATH sheet = it.first;
|
|
|
|
SCH_PIN* pin = it.second;
|
2019-04-20 01:45:33 +00:00
|
|
|
|
2020-01-17 02:33:16 +00:00
|
|
|
if( !pin->ConnectedItems( sheet ).empty() && !pin->GetLibPin()->GetParent()->IsPower() )
|
2019-04-20 01:45:33 +00:00
|
|
|
{
|
|
|
|
// ERC will warn about this: user has wired up an invisible pin
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
SCH_CONNECTION* connection = pin->Connection( sheet );
|
|
|
|
|
|
|
|
if( !connection )
|
2020-06-30 00:27:08 +00:00
|
|
|
connection = pin->InitializeConnection( sheet, this );
|
2019-04-20 01:45:33 +00:00
|
|
|
|
|
|
|
// If this pin already has a subgraph, don't need to process
|
|
|
|
if( connection->SubgraphCode() > 0 )
|
|
|
|
continue;
|
|
|
|
|
|
|
|
connection->SetName( pin->GetName() );
|
|
|
|
|
|
|
|
int code = assignNewNetCode( *connection );
|
|
|
|
|
|
|
|
connection->SetNetCode( code );
|
|
|
|
|
|
|
|
CONNECTION_SUBGRAPH* subgraph;
|
|
|
|
|
|
|
|
if( invisible_pin_subgraphs.count( code ) )
|
|
|
|
{
|
|
|
|
subgraph = invisible_pin_subgraphs.at( code );
|
|
|
|
subgraph->AddItem( pin );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2020-05-13 02:00:37 +00:00
|
|
|
subgraph = new CONNECTION_SUBGRAPH( this );
|
2019-04-20 01:45:33 +00:00
|
|
|
|
|
|
|
subgraph->m_code = m_last_subgraph_code++;
|
|
|
|
subgraph->m_sheet = sheet;
|
|
|
|
|
|
|
|
subgraph->AddItem( pin );
|
|
|
|
subgraph->ResolveDrivers();
|
|
|
|
|
2020-01-18 17:57:02 +00:00
|
|
|
auto key = std::make_pair( subgraph->GetNetName(), code );
|
|
|
|
m_net_code_to_subgraphs_map[ key ].push_back( subgraph );
|
2019-04-20 01:45:33 +00:00
|
|
|
m_subgraphs.push_back( subgraph );
|
2019-04-25 04:37:10 +00:00
|
|
|
m_driver_subgraphs.push_back( subgraph );
|
2019-04-20 01:45:33 +00:00
|
|
|
|
|
|
|
invisible_pin_subgraphs[code] = subgraph;
|
|
|
|
}
|
|
|
|
|
|
|
|
connection->SetSubgraphCode( subgraph->m_code );
|
|
|
|
}
|
|
|
|
|
|
|
|
for( auto it : invisible_pin_subgraphs )
|
|
|
|
it.second->UpdateItemConnections();
|
|
|
|
|
|
|
|
// Here we do all the local (sheet) processing of each subgraph, including assigning net
|
|
|
|
// codes, merging subgraphs together that use label connections, etc.
|
|
|
|
|
2019-04-29 23:41:03 +00:00
|
|
|
// Cache remaining valid subgraphs by sheet path
|
|
|
|
for( auto subgraph : m_driver_subgraphs )
|
|
|
|
m_sheet_to_subgraphs_map[ subgraph->m_sheet ].emplace_back( subgraph );
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
std::unordered_set<CONNECTION_SUBGRAPH*> invalidated_subgraphs;
|
|
|
|
|
2020-04-19 22:20:51 +00:00
|
|
|
for( CONNECTION_SUBGRAPH* subgraph : m_driver_subgraphs )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-20 01:45:33 +00:00
|
|
|
if( subgraph->m_absorbed )
|
|
|
|
continue;
|
|
|
|
|
|
|
|
SCH_CONNECTION* connection = subgraph->m_driver_connection;
|
|
|
|
SCH_SHEET_PATH sheet = subgraph->m_sheet;
|
2019-04-25 03:47:57 +00:00
|
|
|
wxString name = connection->Name();
|
|
|
|
|
|
|
|
// Test subgraphs with weak drivers for net name conflicts and fix them
|
|
|
|
unsigned suffix = 1;
|
|
|
|
|
2020-07-21 00:41:56 +00:00
|
|
|
auto create_new_name =
|
|
|
|
[&suffix]( SCH_CONNECTION* aConn ) -> wxString
|
|
|
|
{
|
|
|
|
wxString newName;
|
|
|
|
|
|
|
|
// For group buses with a prefix, we can add the suffix to the prefix.
|
|
|
|
// If they don't have a prefix, we force the creation of a prefix so that
|
|
|
|
// two buses don't get inadvertently shorted together.
|
|
|
|
if( aConn->Type() == CONNECTION_TYPE::BUS_GROUP )
|
|
|
|
{
|
|
|
|
wxString prefix = aConn->BusPrefix();
|
|
|
|
|
|
|
|
if( prefix.empty() )
|
|
|
|
prefix = wxT( "BUS" ); // So result will be "BUS_1{...}"
|
|
|
|
|
|
|
|
wxString oldName = aConn->Name().AfterFirst( '{' );
|
|
|
|
|
|
|
|
newName = wxString::Format( "%s_%u{%s", prefix, suffix, oldName );
|
|
|
|
|
|
|
|
aConn->ConfigureFromLabel( newName );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
newName = wxString::Format( "%s_%u", aConn->Name(), suffix );
|
|
|
|
aConn->SetSuffix( wxString::Format( "_%u", suffix ) );
|
|
|
|
}
|
|
|
|
|
|
|
|
suffix++;
|
|
|
|
return newName;
|
|
|
|
};
|
2019-04-25 03:47:57 +00:00
|
|
|
|
|
|
|
if( !subgraph->m_strong_driver )
|
|
|
|
{
|
|
|
|
auto& vec = m_net_name_to_subgraphs_map.at( name );
|
|
|
|
|
|
|
|
if( vec.size() > 1 )
|
|
|
|
{
|
2020-07-21 00:41:56 +00:00
|
|
|
wxString new_name = create_new_name( connection );
|
2019-04-25 03:47:57 +00:00
|
|
|
|
|
|
|
while( m_net_name_to_subgraphs_map.count( new_name ) )
|
2020-07-21 00:41:56 +00:00
|
|
|
new_name = create_new_name( connection );
|
2019-04-25 03:47:57 +00:00
|
|
|
|
|
|
|
wxLogTrace( "CONN", "%ld (%s) is weakly driven and not unique. Changing to %s.",
|
|
|
|
subgraph->m_code, name, new_name );
|
|
|
|
|
|
|
|
vec.erase( std::remove( vec.begin(), vec.end(), subgraph ), vec.end() );
|
|
|
|
|
|
|
|
m_net_name_to_subgraphs_map[new_name].emplace_back( subgraph );
|
|
|
|
|
|
|
|
name = new_name;
|
2019-05-02 00:48:27 +00:00
|
|
|
|
|
|
|
subgraph->UpdateItemConnections();
|
2019-04-25 03:47:57 +00:00
|
|
|
}
|
2020-02-05 14:23:55 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
// If there is no conflict, promote sheet pins to be strong drivers so that they
|
|
|
|
// will be considered below for propagation/merging.
|
|
|
|
|
2020-04-19 22:20:51 +00:00
|
|
|
// It is possible for this to generate a conflict if the sheet pin has the same
|
|
|
|
// name as a global label on the same sheet, because global merging will then treat
|
|
|
|
// this subgraph as if it had a matching local label. So, for those cases, we
|
|
|
|
// don't apply this promotion
|
|
|
|
|
2020-02-05 14:23:55 +00:00
|
|
|
if( subgraph->m_driver->Type() == SCH_SHEET_PIN_T )
|
|
|
|
{
|
2020-04-19 22:20:51 +00:00
|
|
|
bool conflict = false;
|
|
|
|
wxString global_name = connection->Name( true );
|
|
|
|
size_t count = m_net_name_to_subgraphs_map.count( global_name );
|
2020-02-05 14:23:55 +00:00
|
|
|
|
2020-04-19 22:20:51 +00:00
|
|
|
if( count )
|
|
|
|
{
|
|
|
|
// A global will conflict if it is on the same sheet as this subgraph, since
|
|
|
|
// it would be connected by implicit local label linking
|
|
|
|
auto& candidates = m_net_name_to_subgraphs_map.at( global_name );
|
|
|
|
|
|
|
|
for( const auto& candidate : candidates )
|
|
|
|
{
|
|
|
|
if( candidate->m_sheet == sheet )
|
|
|
|
conflict = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( conflict )
|
|
|
|
{
|
|
|
|
wxLogTrace( "CONN",
|
|
|
|
"%ld (%s) skipped for promotion due to potential conflict",
|
|
|
|
subgraph->m_code, name );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
wxLogTrace( "CONN",
|
|
|
|
"%ld (%s) weakly driven by unique sheet pin %s, promoting",
|
|
|
|
subgraph->m_code, name,
|
|
|
|
subgraph->m_driver->GetSelectMenuText( EDA_UNITS::MILLIMETRES ) );
|
|
|
|
|
|
|
|
subgraph->m_strong_driver = true;
|
|
|
|
}
|
2020-02-05 14:23:55 +00:00
|
|
|
}
|
|
|
|
}
|
2019-04-25 03:47:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Assign net codes
|
|
|
|
|
2019-03-11 21:32:05 +00:00
|
|
|
if( connection->IsBus() )
|
|
|
|
{
|
2019-05-05 23:48:43 +00:00
|
|
|
int code = -1;
|
|
|
|
|
2019-04-03 09:14:36 +00:00
|
|
|
if( m_bus_name_to_code_map.count( name ) )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
|
|
|
code = m_bus_name_to_code_map.at( name );
|
|
|
|
}
|
2019-04-03 09:14:36 +00:00
|
|
|
else
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
|
|
|
code = m_last_bus_code++;
|
|
|
|
m_bus_name_to_code_map[ name ] = code;
|
|
|
|
}
|
|
|
|
|
|
|
|
connection->SetBusCode( code );
|
2019-04-20 01:45:33 +00:00
|
|
|
assignNetCodesToBus( connection );
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
assignNewNetCode( *connection );
|
|
|
|
}
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
subgraph->UpdateItemConnections();
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
// Reset the flag for the next loop below
|
|
|
|
subgraph->m_dirty = true;
|
2019-04-10 06:40:24 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
// Next, we merge together subgraphs that have label connections, and create
|
|
|
|
// neighbor links for subgraphs that are part of a bus on the same sheet.
|
|
|
|
// For merging, we consider each possible strong driver.
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
// If this subgraph doesn't have a strong driver, let's skip it, since there is no
|
|
|
|
// way it will be merged with anything.
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
if( !subgraph->m_strong_driver )
|
|
|
|
continue;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
// candidate_subgraphs will contain each valid, non-bus subgraph on the same sheet
|
|
|
|
// as the subgraph we are considering that has a strong driver.
|
|
|
|
// Weakly driven subgraphs are not considered since they will never be absorbed or
|
|
|
|
// form neighbor links.
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
std::vector<CONNECTION_SUBGRAPH*> candidate_subgraphs;
|
2019-04-29 23:41:03 +00:00
|
|
|
std::copy_if( m_sheet_to_subgraphs_map[ subgraph->m_sheet ].begin(),
|
|
|
|
m_sheet_to_subgraphs_map[ subgraph->m_sheet ].end(),
|
2019-04-20 01:45:33 +00:00
|
|
|
std::back_inserter( candidate_subgraphs ),
|
|
|
|
[&] ( const CONNECTION_SUBGRAPH* candidate )
|
2020-03-16 11:05:01 +00:00
|
|
|
{
|
|
|
|
return ( !candidate->m_absorbed &&
|
|
|
|
candidate->m_strong_driver &&
|
|
|
|
candidate != subgraph );
|
2019-04-20 01:45:33 +00:00
|
|
|
} );
|
|
|
|
|
|
|
|
// This is a list of connections on the current subgraph to compare to the
|
|
|
|
// drivers of each candidate subgraph. If the current subgraph is a bus,
|
|
|
|
// we should consider each bus member.
|
2020-01-04 15:38:43 +00:00
|
|
|
std::vector< std::shared_ptr<SCH_CONNECTION> > connections_to_check;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
// Also check the main driving connection
|
|
|
|
connections_to_check.push_back( std::make_shared<SCH_CONNECTION>( *connection ) );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
auto add_connections_to_check = [&] ( CONNECTION_SUBGRAPH* aSubgraph ) {
|
|
|
|
for( SCH_ITEM* possible_driver : aSubgraph->m_items )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-20 01:45:33 +00:00
|
|
|
if( possible_driver == aSubgraph->m_driver )
|
|
|
|
continue;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-07-09 22:14:27 +00:00
|
|
|
auto c = getDefaultConnection( possible_driver, aSubgraph );
|
2019-05-13 00:23:16 +00:00
|
|
|
|
2020-02-05 14:23:55 +00:00
|
|
|
if( c )
|
|
|
|
{
|
|
|
|
if( c->Type() != aSubgraph->m_driver_connection->Type() )
|
|
|
|
continue;
|
2019-05-13 00:23:16 +00:00
|
|
|
|
2020-02-05 14:23:55 +00:00
|
|
|
if( c->Name( true ) == aSubgraph->m_driver_connection->Name( true ) )
|
|
|
|
continue;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-02-05 14:23:55 +00:00
|
|
|
connections_to_check.push_back( c );
|
|
|
|
wxLogTrace( "CONN", "%lu (%s): Adding secondary driver %s", aSubgraph->m_code,
|
|
|
|
aSubgraph->m_driver_connection->Name( true ), c->Name( true ) );
|
2019-04-08 03:54:24 +00:00
|
|
|
}
|
|
|
|
}
|
2019-04-20 01:45:33 +00:00
|
|
|
};
|
2019-04-06 01:14:15 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
// Now add other strong drivers
|
|
|
|
// The actual connection attached to these items will have been overwritten
|
|
|
|
// by the chosen driver of the subgraph, so we need to create a dummy connection
|
|
|
|
add_connections_to_check( subgraph );
|
2019-04-06 01:14:15 +00:00
|
|
|
|
2019-03-11 21:32:05 +00:00
|
|
|
for( unsigned i = 0; i < connections_to_check.size(); i++ )
|
|
|
|
{
|
|
|
|
auto member = connections_to_check[i];
|
|
|
|
|
|
|
|
if( member->IsBus() )
|
|
|
|
{
|
|
|
|
connections_to_check.insert( connections_to_check.end(),
|
|
|
|
member->Members().begin(),
|
|
|
|
member->Members().end() );
|
|
|
|
}
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
wxString test_name = member->Name( true );
|
|
|
|
|
2019-03-11 21:32:05 +00:00
|
|
|
for( auto candidate : candidate_subgraphs )
|
|
|
|
{
|
2019-04-20 01:45:33 +00:00
|
|
|
if( candidate->m_absorbed )
|
|
|
|
continue;
|
|
|
|
|
|
|
|
bool match = false;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
if( candidate->m_driver_connection->Name( true ) == test_name )
|
2019-04-12 03:38:32 +00:00
|
|
|
{
|
2019-04-20 01:45:33 +00:00
|
|
|
match = true;
|
2019-04-12 03:38:32 +00:00
|
|
|
}
|
2019-04-20 01:45:33 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
if( !candidate->m_multiple_drivers )
|
|
|
|
continue;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
for( SCH_ITEM *driver : candidate->m_drivers )
|
|
|
|
{
|
|
|
|
if( driver == candidate->m_driver )
|
|
|
|
continue;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-05-12 22:41:04 +00:00
|
|
|
// Sheet pins are not candidates for merging
|
|
|
|
if( driver->Type() == SCH_SHEET_PIN_T )
|
|
|
|
continue;
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
if( driver->Type() == SCH_PIN_T )
|
|
|
|
{
|
2019-07-27 15:28:59 +00:00
|
|
|
auto pin = static_cast<SCH_PIN*>( driver );
|
|
|
|
|
|
|
|
if( pin->IsPowerConnection() && pin->GetName() == test_name )
|
2019-04-20 01:45:33 +00:00
|
|
|
{
|
|
|
|
match = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
wxASSERT( driver->Type() == SCH_LABEL_T ||
|
|
|
|
driver->Type() == SCH_GLOBAL_LABEL_T ||
|
2019-05-12 22:41:04 +00:00
|
|
|
driver->Type() == SCH_HIER_LABEL_T );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-07-09 22:14:27 +00:00
|
|
|
if( subgraph->GetNameForDriver( driver ) == test_name )
|
2019-04-20 01:45:33 +00:00
|
|
|
{
|
|
|
|
match = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
if( match )
|
|
|
|
{
|
|
|
|
if( connection->IsBus() && candidate->m_driver_connection->IsNet() )
|
|
|
|
{
|
2020-01-04 15:38:43 +00:00
|
|
|
wxLogTrace( "CONN", "%lu (%s) has bus child %lu (%s)", subgraph->m_code,
|
2019-04-20 01:45:33 +00:00
|
|
|
connection->Name(), candidate->m_code, member->Name() );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-05-05 23:48:43 +00:00
|
|
|
subgraph->m_bus_neighbors[member].insert( candidate );
|
|
|
|
candidate->m_bus_parents[member].insert( subgraph );
|
2019-04-20 01:45:33 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
wxLogTrace( "CONN", "%lu (%s) absorbs neighbor %lu (%s)",
|
|
|
|
subgraph->m_code, connection->Name(),
|
2019-05-13 00:23:16 +00:00
|
|
|
candidate->m_code, candidate->m_driver_connection->Name() );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-01-04 15:38:43 +00:00
|
|
|
// Candidate may have other non-chosen drivers we need to follow
|
|
|
|
add_connections_to_check( candidate );
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
subgraph->Absorb( candidate );
|
|
|
|
invalidated_subgraphs.insert( subgraph );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
// Update any subgraph that was invalidated above
|
|
|
|
for( auto subgraph : invalidated_subgraphs )
|
|
|
|
{
|
|
|
|
if( subgraph->m_absorbed )
|
|
|
|
continue;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
subgraph->ResolveDrivers();
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
if( subgraph->m_driver_connection->IsBus() )
|
|
|
|
assignNetCodesToBus( subgraph->m_driver_connection );
|
2019-03-11 21:32:05 +00:00
|
|
|
else
|
2019-04-20 01:45:33 +00:00
|
|
|
assignNewNetCode( *subgraph->m_driver_connection );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
subgraph->UpdateItemConnections();
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
wxLogTrace( "CONN", "Re-resolving drivers for %lu (%s)", subgraph->m_code,
|
|
|
|
subgraph->m_driver_connection->Name() );
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
// Absorbed subgraphs should no longer be considered
|
2019-04-25 04:37:10 +00:00
|
|
|
m_driver_subgraphs.erase( std::remove_if( m_driver_subgraphs.begin(), m_driver_subgraphs.end(),
|
2020-03-16 11:05:01 +00:00
|
|
|
[&] ( const CONNECTION_SUBGRAPH* candidate ) -> bool
|
|
|
|
{
|
|
|
|
return candidate->m_absorbed;
|
|
|
|
} ),
|
|
|
|
m_driver_subgraphs.end() );
|
2019-04-20 01:45:33 +00:00
|
|
|
|
|
|
|
// Store global subgraphs for later reference
|
|
|
|
std::vector<CONNECTION_SUBGRAPH*> global_subgraphs;
|
2019-04-25 04:37:10 +00:00
|
|
|
std::copy_if( m_driver_subgraphs.begin(), m_driver_subgraphs.end(),
|
2019-04-20 01:45:33 +00:00
|
|
|
std::back_inserter( global_subgraphs ),
|
2020-03-16 11:05:01 +00:00
|
|
|
[&] ( const CONNECTION_SUBGRAPH* candidate ) -> bool
|
|
|
|
{
|
2019-04-20 01:45:33 +00:00
|
|
|
return !candidate->m_local_driver;
|
|
|
|
} );
|
|
|
|
|
2019-04-29 23:41:03 +00:00
|
|
|
// Recache remaining valid subgraphs by sheet path
|
|
|
|
m_sheet_to_subgraphs_map.clear();
|
|
|
|
for( auto subgraph : m_driver_subgraphs )
|
|
|
|
m_sheet_to_subgraphs_map[ subgraph->m_sheet ].emplace_back( subgraph );
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
// Next time through the subgraphs, we do some post-processing to handle things like
|
|
|
|
// connecting bus members to their neighboring subgraphs, and then propagate connections
|
|
|
|
// through the hierarchy
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-25 04:37:10 +00:00
|
|
|
for( auto subgraph : m_driver_subgraphs )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-06 01:14:15 +00:00
|
|
|
if( !subgraph->m_dirty )
|
2019-03-11 21:32:05 +00:00
|
|
|
continue;
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
// For subgraphs that are driven by a global (power port or label) and have more
|
|
|
|
// than one global driver, we need to seek out other subgraphs driven by the
|
|
|
|
// same name as the non-chosen driver and update them to match the chosen one.
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
if( !subgraph->m_local_driver && subgraph->m_multiple_drivers )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-20 01:45:33 +00:00
|
|
|
for( SCH_ITEM* driver : subgraph->m_drivers )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-20 01:45:33 +00:00
|
|
|
if( driver == subgraph->m_driver )
|
2019-03-11 21:32:05 +00:00
|
|
|
continue;
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
wxString secondary_name = subgraph->GetNameForDriver( driver );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
if( secondary_name == subgraph->m_driver_connection->Name() )
|
|
|
|
continue;
|
2019-04-08 03:54:24 +00:00
|
|
|
|
2020-03-06 00:08:55 +00:00
|
|
|
bool secondary_is_global = CONNECTION_SUBGRAPH::GetDriverPriority( driver )
|
|
|
|
>= CONNECTION_SUBGRAPH::PRIORITY::POWER_PIN;
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
for( CONNECTION_SUBGRAPH* candidate : global_subgraphs )
|
2019-04-08 03:54:24 +00:00
|
|
|
{
|
2019-04-20 01:45:33 +00:00
|
|
|
if( candidate == subgraph )
|
2019-03-11 21:32:05 +00:00
|
|
|
continue;
|
|
|
|
|
2020-03-06 00:08:55 +00:00
|
|
|
if( !secondary_is_global && candidate->m_sheet != subgraph->m_sheet )
|
|
|
|
continue;
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
SCH_CONNECTION* conn = candidate->m_driver_connection;
|
2019-04-08 03:54:24 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
if( conn->Name() == secondary_name )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-20 01:45:33 +00:00
|
|
|
wxLogTrace( "CONN", "Global %lu (%s) promoted to %s", candidate->m_code,
|
|
|
|
conn->Name(), subgraph->m_driver_connection->Name() );
|
|
|
|
|
|
|
|
conn->Clone( *subgraph->m_driver_connection );
|
|
|
|
candidate->UpdateItemConnections();
|
2019-05-05 04:03:58 +00:00
|
|
|
|
|
|
|
candidate->m_dirty = false;
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
// This call will handle descending the hierarchy and updating child subgraphs
|
|
|
|
propagateToNeighbors( subgraph );
|
|
|
|
}
|
2019-04-04 01:47:26 +00:00
|
|
|
|
2019-05-05 23:48:43 +00:00
|
|
|
// Handle buses that have been linked together somewhere by member (net) connections.
|
|
|
|
// This feels a bit hacky, perhaps this algorithm should be revisited in the future.
|
|
|
|
|
|
|
|
// For net subgraphs that have more than one bus parent, we need to ensure that those
|
|
|
|
// buses are linked together in the final netlist. The final name of each bus might not
|
|
|
|
// match the local name that was used to establish the parent-child relationship, because
|
|
|
|
// the bus may have been renamed by a hierarchical connection. So, for each of these cases,
|
|
|
|
// we need to identify the appropriate bus members to link together (and their final names),
|
|
|
|
// and then update all instances of the old name in the hierarchy.
|
|
|
|
|
|
|
|
for( CONNECTION_SUBGRAPH* subgraph : m_driver_subgraphs )
|
|
|
|
{
|
|
|
|
if( subgraph->m_bus_parents.size() < 2 )
|
|
|
|
continue;
|
|
|
|
|
|
|
|
SCH_CONNECTION* conn = subgraph->m_driver_connection;
|
|
|
|
|
2020-01-04 15:38:43 +00:00
|
|
|
wxLogTrace( "CONN", "%lu (%s) has multiple bus parents", subgraph->m_code, conn->Name() );
|
|
|
|
|
2019-05-05 23:48:43 +00:00
|
|
|
wxASSERT( conn->IsNet() );
|
|
|
|
|
|
|
|
for( const auto& it : subgraph->m_bus_parents )
|
|
|
|
{
|
|
|
|
SCH_CONNECTION* link_member = it.first.get();
|
|
|
|
|
|
|
|
for( CONNECTION_SUBGRAPH* parent : it.second )
|
|
|
|
{
|
2019-07-27 14:51:38 +00:00
|
|
|
while( parent->m_absorbed )
|
2019-06-06 02:26:30 +00:00
|
|
|
parent = parent->m_absorbed_by;
|
|
|
|
|
2019-05-05 23:48:43 +00:00
|
|
|
SCH_CONNECTION* match = matchBusMember( parent->m_driver_connection, link_member );
|
|
|
|
|
|
|
|
if( !match )
|
|
|
|
{
|
|
|
|
wxLogTrace( "CONN", "Warning: could not match %s inside %lu (%s)", conn->Name(),
|
|
|
|
parent->m_code, parent->m_driver_connection->Name() );
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( conn->Name() != match->Name() )
|
|
|
|
{
|
|
|
|
wxString old_name = match->Name();
|
|
|
|
|
|
|
|
wxLogTrace( "CONN", "Updating %lu (%s) member %s to %s", parent->m_code,
|
|
|
|
parent->m_driver_connection->Name(), old_name, conn->Name() );
|
|
|
|
|
|
|
|
match->Clone( *conn );
|
|
|
|
|
|
|
|
if( !m_net_name_to_subgraphs_map.count( old_name ) )
|
|
|
|
continue;
|
|
|
|
|
|
|
|
for( CONNECTION_SUBGRAPH* old_sg : m_net_name_to_subgraphs_map.at( old_name ) )
|
|
|
|
{
|
2019-07-27 14:51:38 +00:00
|
|
|
while( old_sg->m_absorbed )
|
2019-05-05 23:48:43 +00:00
|
|
|
old_sg = old_sg->m_absorbed_by;
|
|
|
|
|
|
|
|
old_sg->m_driver_connection->Clone( *conn );
|
|
|
|
old_sg->UpdateItemConnections();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
m_net_code_to_subgraphs_map.clear();
|
2020-05-21 03:40:31 +00:00
|
|
|
m_net_name_to_subgraphs_map.clear();
|
2019-04-04 01:47:26 +00:00
|
|
|
|
2020-03-16 11:05:01 +00:00
|
|
|
for( CONNECTION_SUBGRAPH* subgraph : m_driver_subgraphs )
|
2019-04-20 01:45:33 +00:00
|
|
|
{
|
2019-05-05 04:03:58 +00:00
|
|
|
// Every driven subgraph should have been marked by now
|
2019-04-20 01:45:33 +00:00
|
|
|
if( subgraph->m_dirty )
|
2019-05-05 04:03:58 +00:00
|
|
|
{
|
|
|
|
// TODO(JE) this should be caught by hierarchical sheet port/pin ERC, check this
|
|
|
|
// Reset to false so no complaints come up later
|
2019-04-20 01:45:33 +00:00
|
|
|
subgraph->m_dirty = false;
|
2019-05-05 04:03:58 +00:00
|
|
|
}
|
2019-04-04 01:47:26 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
if( subgraph->m_driver_connection->IsBus() )
|
2020-05-24 03:57:10 +00:00
|
|
|
{
|
|
|
|
// No other processing to do on buses
|
2019-04-20 01:45:33 +00:00
|
|
|
continue;
|
2020-05-24 03:57:10 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// As a visual aid, we can check sheet pins that are driven by themselves to see
|
|
|
|
// if they should be promoted to buses
|
|
|
|
|
|
|
|
if( subgraph->m_driver->Type() == SCH_SHEET_PIN_T )
|
|
|
|
{
|
|
|
|
SCH_SHEET_PIN* pin = static_cast<SCH_SHEET_PIN*>( subgraph->m_driver );
|
|
|
|
|
|
|
|
if( SCH_SHEET* sheet = pin->GetParent() )
|
|
|
|
{
|
|
|
|
wxString pinText = pin->GetText();
|
|
|
|
|
|
|
|
for( auto item : sheet->GetScreen()->Items().OfType( SCH_HIER_LABEL_T ) )
|
|
|
|
{
|
|
|
|
auto label = static_cast<SCH_HIERLABEL*>( item );
|
|
|
|
|
|
|
|
if( label->GetText() == pinText )
|
|
|
|
{
|
|
|
|
SCH_SHEET_PATH path = subgraph->m_sheet;
|
|
|
|
path.push_back( sheet );
|
|
|
|
|
|
|
|
SCH_CONNECTION* parent_conn = label->Connection( path );
|
|
|
|
|
|
|
|
if( parent_conn && parent_conn->IsBus() )
|
|
|
|
subgraph->m_driver_connection->SetType( CONNECTION_TYPE::BUS );
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( subgraph->m_driver_connection->IsBus() )
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-04-04 01:47:26 +00:00
|
|
|
|
2020-01-18 17:57:02 +00:00
|
|
|
auto key = std::make_pair( subgraph->GetNetName(),
|
|
|
|
subgraph->m_driver_connection->NetCode() );
|
|
|
|
m_net_code_to_subgraphs_map[ key ].push_back( subgraph );
|
2020-05-21 03:40:31 +00:00
|
|
|
|
|
|
|
m_net_name_to_subgraphs_map[subgraph->m_driver_connection->Name()].push_back( subgraph );
|
2019-04-20 01:45:33 +00:00
|
|
|
}
|
2019-04-04 01:47:26 +00:00
|
|
|
|
2020-01-07 05:12:37 +00:00
|
|
|
// Clean up and deallocate stale subgraphs
|
2019-04-20 01:45:33 +00:00
|
|
|
m_subgraphs.erase( std::remove_if( m_subgraphs.begin(), m_subgraphs.end(),
|
2020-03-16 11:05:01 +00:00
|
|
|
[&]( const CONNECTION_SUBGRAPH* sg )
|
|
|
|
{
|
2020-01-07 05:12:37 +00:00
|
|
|
if( sg->m_absorbed )
|
|
|
|
{
|
|
|
|
delete sg;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
} ),
|
|
|
|
m_subgraphs.end() );
|
2019-04-20 01:45:33 +00:00
|
|
|
}
|
2019-04-04 01:47:26 +00:00
|
|
|
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
int CONNECTION_GRAPH::assignNewNetCode( SCH_CONNECTION& aConnection )
|
|
|
|
{
|
|
|
|
int code;
|
2019-04-12 03:38:32 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
if( m_net_name_to_code_map.count( aConnection.Name() ) )
|
|
|
|
{
|
|
|
|
code = m_net_name_to_code_map.at( aConnection.Name() );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
code = m_last_net_code++;
|
|
|
|
m_net_name_to_code_map[ aConnection.Name() ] = code;
|
|
|
|
}
|
2019-04-12 03:38:32 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
aConnection.SetNetCode( code );
|
2019-04-12 03:38:32 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
return code;
|
|
|
|
}
|
2019-04-04 01:47:26 +00:00
|
|
|
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
void CONNECTION_GRAPH::assignNetCodesToBus( SCH_CONNECTION* aConnection )
|
|
|
|
{
|
|
|
|
auto connections_to_check( aConnection->Members() );
|
|
|
|
|
|
|
|
for( unsigned i = 0; i < connections_to_check.size(); i++ )
|
|
|
|
{
|
|
|
|
auto member = connections_to_check[i];
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
if( member->IsBus() )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-20 01:45:33 +00:00
|
|
|
connections_to_check.insert( connections_to_check.end(),
|
|
|
|
member->Members().begin(),
|
|
|
|
member->Members().end() );
|
|
|
|
continue;
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
assignNewNetCode( *member );
|
|
|
|
}
|
|
|
|
}
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph )
|
|
|
|
{
|
|
|
|
SCH_CONNECTION* conn = aSubgraph->m_driver_connection;
|
2019-05-07 01:36:01 +00:00
|
|
|
std::vector<CONNECTION_SUBGRAPH*> search_list;
|
|
|
|
std::unordered_set<CONNECTION_SUBGRAPH*> visited;
|
2020-02-05 14:23:55 +00:00
|
|
|
std::vector<SCH_CONNECTION*> stale_bus_members;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-05-07 01:36:01 +00:00
|
|
|
auto visit = [&] ( CONNECTION_SUBGRAPH* aParent ) {
|
2019-04-29 21:44:49 +00:00
|
|
|
for( SCH_SHEET_PIN* pin : aParent->m_hier_pins )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-05-05 04:03:58 +00:00
|
|
|
SCH_SHEET_PATH path = aParent->m_sheet;
|
2019-04-29 21:44:49 +00:00
|
|
|
path.push_back( pin->GetParent() );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-29 23:41:03 +00:00
|
|
|
if( !m_sheet_to_subgraphs_map.count( path ) )
|
|
|
|
continue;
|
|
|
|
|
2020-07-09 22:14:27 +00:00
|
|
|
for( CONNECTION_SUBGRAPH* candidate : m_sheet_to_subgraphs_map.at( path ) )
|
2019-04-20 01:45:33 +00:00
|
|
|
{
|
2019-04-29 23:41:03 +00:00
|
|
|
if( !candidate->m_strong_driver ||
|
2019-05-07 23:12:35 +00:00
|
|
|
candidate->m_hier_ports.empty() ||
|
|
|
|
visited.count( candidate ) )
|
2019-04-20 01:45:33 +00:00
|
|
|
continue;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
for( SCH_HIERLABEL* label : candidate->m_hier_ports )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2020-07-09 22:14:27 +00:00
|
|
|
if( candidate->GetNameForDriver( label ) == aParent->GetNameForDriver( pin ) )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-05-07 23:12:35 +00:00
|
|
|
wxLogTrace( "CONN", "%lu: found child %lu (%s)", aParent->m_code,
|
2019-04-20 01:45:33 +00:00
|
|
|
candidate->m_code, candidate->m_driver_connection->Name() );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-11-30 02:10:16 +00:00
|
|
|
candidate->m_hier_parent = aParent;
|
|
|
|
|
2019-05-07 01:36:01 +00:00
|
|
|
search_list.push_back( candidate );
|
2019-04-20 01:45:33 +00:00
|
|
|
break;
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-05-07 01:36:01 +00:00
|
|
|
|
|
|
|
for( SCH_HIERLABEL* label : aParent->m_hier_ports )
|
|
|
|
{
|
|
|
|
SCH_SHEET_PATH path = aParent->m_sheet;
|
|
|
|
path.pop_back();
|
|
|
|
|
|
|
|
if( !m_sheet_to_subgraphs_map.count( path ) )
|
|
|
|
continue;
|
|
|
|
|
2020-07-09 22:14:27 +00:00
|
|
|
for( CONNECTION_SUBGRAPH* candidate : m_sheet_to_subgraphs_map.at( path ) )
|
2019-05-07 01:36:01 +00:00
|
|
|
{
|
2019-05-07 23:12:35 +00:00
|
|
|
if( candidate->m_hier_pins.empty() ||
|
|
|
|
visited.count( candidate ) ||
|
|
|
|
( candidate->m_driver_connection->Type() !=
|
|
|
|
aParent->m_driver_connection->Type() ) )
|
2019-05-07 01:36:01 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
for( SCH_SHEET_PIN* pin : candidate->m_hier_pins )
|
|
|
|
{
|
|
|
|
SCH_SHEET_PATH pin_path = path;
|
|
|
|
pin_path.push_back( pin->GetParent() );
|
|
|
|
|
|
|
|
if( pin_path != aParent->m_sheet )
|
|
|
|
continue;
|
|
|
|
|
2020-07-09 22:14:27 +00:00
|
|
|
if( aParent->GetNameForDriver( label ) == candidate->GetNameForDriver( pin ) )
|
2019-05-07 01:36:01 +00:00
|
|
|
{
|
2019-05-07 23:12:35 +00:00
|
|
|
wxLogTrace( "CONN", "%lu: found additional parent %lu (%s)",
|
|
|
|
aParent->m_code, candidate->m_code,
|
|
|
|
candidate->m_driver_connection->Name() );
|
2019-05-07 01:36:01 +00:00
|
|
|
|
|
|
|
search_list.push_back( candidate );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-04-20 01:45:33 +00:00
|
|
|
};
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-05-05 23:48:43 +00:00
|
|
|
auto propagate_bus_neighbors = [&]( CONNECTION_SUBGRAPH* aParentGraph ) {
|
|
|
|
for( const auto& kv : aParentGraph->m_bus_neighbors )
|
2019-04-20 01:45:33 +00:00
|
|
|
{
|
|
|
|
for( CONNECTION_SUBGRAPH* neighbor : kv.second )
|
|
|
|
{
|
|
|
|
// May have been absorbed but won't have been deleted
|
2019-07-27 14:51:38 +00:00
|
|
|
while( neighbor->m_absorbed )
|
2019-05-05 23:48:43 +00:00
|
|
|
neighbor = neighbor->m_absorbed_by;
|
2019-03-18 22:38:06 +00:00
|
|
|
|
2019-05-05 23:48:43 +00:00
|
|
|
SCH_CONNECTION* parent = aParentGraph->m_driver_connection;
|
2019-03-18 22:38:06 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
// Now member may be out of date, since we just cloned the
|
|
|
|
// connection from higher up in the hierarchy. We need to
|
|
|
|
// figure out what the actual new connection is.
|
2019-05-05 23:48:43 +00:00
|
|
|
SCH_CONNECTION* member = matchBusMember( parent, kv.first.get() );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-02-05 14:23:55 +00:00
|
|
|
if( !member )
|
|
|
|
{
|
|
|
|
// Try harder: we might match on a secondary driver
|
|
|
|
for( CONNECTION_SUBGRAPH* sg : kv.second )
|
|
|
|
{
|
|
|
|
if( sg->m_multiple_drivers )
|
|
|
|
{
|
|
|
|
SCH_SHEET_PATH sheet = sg->m_sheet;
|
|
|
|
|
|
|
|
for( SCH_ITEM* driver : sg->m_drivers )
|
|
|
|
{
|
2020-07-09 22:14:27 +00:00
|
|
|
auto c = getDefaultConnection( driver, sg );
|
2020-02-05 14:23:55 +00:00
|
|
|
member = matchBusMember( parent, c.get() );
|
|
|
|
|
|
|
|
if( member )
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( member )
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
// This is bad, probably an ERC error
|
|
|
|
if( !member )
|
|
|
|
{
|
|
|
|
wxLogTrace( "CONN", "Could not match bus member %s in %s",
|
|
|
|
kv.first->Name(), parent->Name() );
|
|
|
|
continue;
|
|
|
|
}
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
auto neighbor_conn = neighbor->m_driver_connection;
|
2019-05-05 23:48:43 +00:00
|
|
|
auto neighbor_name = neighbor_conn->Name();
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-01-03 03:09:02 +00:00
|
|
|
// Matching name: no update needed
|
2019-05-05 23:48:43 +00:00
|
|
|
if( neighbor_name == member->Name() )
|
2019-04-20 01:45:33 +00:00
|
|
|
continue;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-02-05 14:23:55 +00:00
|
|
|
// Safety check against infinite recursion
|
|
|
|
wxASSERT( neighbor_conn->IsNet() );
|
|
|
|
|
2020-01-04 15:38:43 +00:00
|
|
|
wxLogTrace( "CONN", "%lu (%s) connected to bus member %s (local %s)",
|
|
|
|
neighbor->m_code, neighbor_name, member->Name(), member->LocalName() );
|
2020-01-03 03:09:02 +00:00
|
|
|
|
2020-01-04 15:38:43 +00:00
|
|
|
// Take whichever name is higher priority
|
|
|
|
if( CONNECTION_SUBGRAPH::GetDriverPriority( neighbor->m_driver )
|
|
|
|
>= CONNECTION_SUBGRAPH::PRIORITY::POWER_PIN )
|
|
|
|
{
|
|
|
|
member->Clone( *neighbor_conn );
|
2020-02-05 14:23:55 +00:00
|
|
|
stale_bus_members.push_back( member );
|
2020-01-04 15:38:43 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
neighbor_conn->Clone( *member );
|
|
|
|
neighbor->UpdateItemConnections();
|
2019-05-05 23:48:43 +00:00
|
|
|
|
2020-01-04 15:38:43 +00:00
|
|
|
recacheSubgraphName( neighbor, neighbor_name );
|
2019-05-08 01:31:37 +00:00
|
|
|
|
2020-01-04 15:38:43 +00:00
|
|
|
// Recurse onto this neighbor in case it needs to re-propagate
|
|
|
|
neighbor->m_dirty = true;
|
|
|
|
propagateToNeighbors( neighbor );
|
|
|
|
}
|
2019-04-20 01:45:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-06-06 01:33:13 +00:00
|
|
|
// If we are a bus, we must propagate to local neighbors and then the hierarchy
|
|
|
|
if( conn->IsBus() )
|
|
|
|
propagate_bus_neighbors( aSubgraph );
|
|
|
|
|
2019-05-05 04:03:58 +00:00
|
|
|
// If we don't have any hier pins (i.e. no children), nothing to do
|
|
|
|
if( aSubgraph->m_hier_pins.empty() )
|
2019-04-20 01:45:33 +00:00
|
|
|
{
|
2019-05-05 04:03:58 +00:00
|
|
|
// If we also don't have any parents, we'll never be visited again
|
|
|
|
if( aSubgraph->m_hier_ports.empty() )
|
|
|
|
aSubgraph->m_dirty = false;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
return;
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
|
2019-05-05 04:03:58 +00:00
|
|
|
// If we do have hier ports, skip this subgraph as it will be visited by a parent
|
|
|
|
// TODO(JE) this will leave the subgraph dirty if there is no matching parent subgraph,
|
|
|
|
// which should be flagged as an ERC error
|
|
|
|
if( !aSubgraph->m_hier_ports.empty() )
|
2019-04-20 01:45:33 +00:00
|
|
|
return;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-05-07 01:36:01 +00:00
|
|
|
visited.insert( aSubgraph );
|
2019-05-05 14:25:38 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
wxLogTrace( "CONN", "Propagating %lu (%s) to subsheets",
|
|
|
|
aSubgraph->m_code, aSubgraph->m_driver_connection->Name() );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-05-07 01:36:01 +00:00
|
|
|
visit( aSubgraph );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-03-20 15:38:42 +00:00
|
|
|
for( unsigned i = 0; i < search_list.size(); i++ )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2020-03-20 15:38:42 +00:00
|
|
|
auto child = search_list[i];
|
|
|
|
|
2019-05-07 01:36:01 +00:00
|
|
|
visited.insert( child );
|
2019-05-05 14:25:38 +00:00
|
|
|
|
2019-05-07 01:36:01 +00:00
|
|
|
visit( child );
|
2019-05-05 23:48:43 +00:00
|
|
|
|
2019-05-07 01:36:01 +00:00
|
|
|
child->m_dirty = false;
|
|
|
|
}
|
2019-05-05 14:25:38 +00:00
|
|
|
|
2019-05-07 01:36:01 +00:00
|
|
|
// Now, find the best driver for this chain of subgraphs
|
|
|
|
CONNECTION_SUBGRAPH* driver = aSubgraph;
|
|
|
|
CONNECTION_SUBGRAPH::PRIORITY highest =
|
|
|
|
CONNECTION_SUBGRAPH::GetDriverPriority( aSubgraph->m_driver );
|
2019-05-05 23:48:43 +00:00
|
|
|
|
2019-05-07 01:36:01 +00:00
|
|
|
// Check if a subsheet has a higher-priority connection to the same net
|
2020-01-03 03:09:02 +00:00
|
|
|
if( highest < CONNECTION_SUBGRAPH::PRIORITY::POWER_PIN )
|
2019-05-07 01:36:01 +00:00
|
|
|
{
|
|
|
|
for( CONNECTION_SUBGRAPH* subgraph : visited )
|
|
|
|
{
|
|
|
|
CONNECTION_SUBGRAPH::PRIORITY priority =
|
|
|
|
CONNECTION_SUBGRAPH::GetDriverPriority( subgraph->m_driver );
|
2019-05-05 14:25:38 +00:00
|
|
|
|
2019-05-08 01:59:36 +00:00
|
|
|
// Upgrade driver to be this subgraph if this subgraph has a power pin or global
|
|
|
|
// Also upgrade if we found something with a shorter sheet path (higher in hierarchy)
|
|
|
|
// but with an equivalent priority
|
|
|
|
|
2020-01-03 03:09:02 +00:00
|
|
|
if( ( priority >= CONNECTION_SUBGRAPH::PRIORITY::POWER_PIN ) ||
|
2019-05-08 01:59:36 +00:00
|
|
|
( priority >= highest && subgraph->m_sheet.size() < aSubgraph->m_sheet.size() ) )
|
2019-05-07 01:36:01 +00:00
|
|
|
driver = subgraph;
|
2019-05-05 04:03:58 +00:00
|
|
|
}
|
2019-05-07 01:36:01 +00:00
|
|
|
}
|
2019-05-05 04:03:58 +00:00
|
|
|
|
2019-05-07 01:36:01 +00:00
|
|
|
if( driver != aSubgraph )
|
|
|
|
{
|
|
|
|
wxLogTrace( "CONN", "%lu (%s) overridden by new driver %lu (%s)",
|
|
|
|
aSubgraph->m_code, aSubgraph->m_driver_connection->Name(),
|
|
|
|
driver->m_code, driver->m_driver_connection->Name() );
|
|
|
|
}
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-05-07 01:36:01 +00:00
|
|
|
conn = driver->m_driver_connection;
|
2019-05-05 23:48:43 +00:00
|
|
|
|
2019-05-07 01:36:01 +00:00
|
|
|
for( CONNECTION_SUBGRAPH* subgraph : visited )
|
|
|
|
{
|
|
|
|
wxString old_name = subgraph->m_driver_connection->Name();
|
2019-05-05 23:48:43 +00:00
|
|
|
|
2019-05-07 01:36:01 +00:00
|
|
|
subgraph->m_driver_connection->Clone( *conn );
|
|
|
|
subgraph->UpdateItemConnections();
|
2019-05-05 23:48:43 +00:00
|
|
|
|
2020-02-05 14:23:55 +00:00
|
|
|
if( old_name != conn->Name() )
|
|
|
|
recacheSubgraphName( subgraph, old_name );
|
2019-04-20 01:45:33 +00:00
|
|
|
|
2019-05-05 04:03:58 +00:00
|
|
|
if( conn->IsBus() )
|
2019-05-07 01:36:01 +00:00
|
|
|
propagate_bus_neighbors( subgraph );
|
2019-04-20 01:45:33 +00:00
|
|
|
}
|
2019-05-05 04:03:58 +00:00
|
|
|
|
2020-02-05 14:23:55 +00:00
|
|
|
// Somewhere along the way, a bus member may have been upgraded to a global or power label.
|
|
|
|
// Because this can happen anywhere, we need a second pass to update all instances of that bus
|
|
|
|
// member to have the correct connection info
|
|
|
|
if( conn->IsBus() && !stale_bus_members.empty() )
|
|
|
|
{
|
|
|
|
for( auto stale_member : stale_bus_members )
|
|
|
|
{
|
|
|
|
for( CONNECTION_SUBGRAPH* subgraph : visited )
|
|
|
|
{
|
2020-03-16 11:05:01 +00:00
|
|
|
SCH_CONNECTION* member = matchBusMember( subgraph->m_driver_connection,
|
|
|
|
stale_member );
|
2020-02-05 14:23:55 +00:00
|
|
|
wxASSERT( member );
|
|
|
|
|
|
|
|
wxLogTrace( "CONN", "Updating %lu (%s) member %s to %s", subgraph->m_code,
|
|
|
|
subgraph->m_driver_connection->Name(), member->LocalName(),
|
|
|
|
stale_member->Name() );
|
|
|
|
|
|
|
|
member->Clone( *stale_member );
|
|
|
|
|
|
|
|
propagate_bus_neighbors( subgraph );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-05-05 04:03:58 +00:00
|
|
|
aSubgraph->m_dirty = false;
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-07-09 22:14:27 +00:00
|
|
|
std::shared_ptr<SCH_CONNECTION> CONNECTION_GRAPH::getDefaultConnection( SCH_ITEM* aItem,
|
|
|
|
CONNECTION_SUBGRAPH* aSubgraph )
|
2020-02-05 14:23:55 +00:00
|
|
|
{
|
|
|
|
auto c = std::shared_ptr<SCH_CONNECTION>( nullptr );
|
|
|
|
|
|
|
|
switch( aItem->Type() )
|
|
|
|
{
|
|
|
|
case SCH_PIN_T:
|
|
|
|
{
|
|
|
|
auto pin = static_cast<SCH_PIN*>( aItem );
|
|
|
|
|
|
|
|
if( pin->IsPowerConnection() )
|
2020-07-09 22:14:27 +00:00
|
|
|
c = std::make_shared<SCH_CONNECTION>( aItem, aSubgraph->m_sheet );
|
|
|
|
|
2020-02-05 14:23:55 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SCH_GLOBAL_LABEL_T:
|
|
|
|
case SCH_HIER_LABEL_T:
|
|
|
|
case SCH_LABEL_T:
|
|
|
|
{
|
2020-07-09 22:14:27 +00:00
|
|
|
c = std::make_shared<SCH_CONNECTION>( aItem, aSubgraph->m_sheet );
|
2020-02-05 14:23:55 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2020-07-09 22:14:27 +00:00
|
|
|
if( c )
|
|
|
|
{
|
|
|
|
c->SetGraph( this );
|
|
|
|
c->ConfigureFromLabel( aSubgraph->GetNameForDriver( aItem ) );
|
|
|
|
}
|
|
|
|
|
2020-02-05 14:23:55 +00:00
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-03-16 11:05:01 +00:00
|
|
|
SCH_CONNECTION* CONNECTION_GRAPH::matchBusMember( SCH_CONNECTION* aBusConnection,
|
|
|
|
SCH_CONNECTION* aSearch )
|
2019-05-05 23:48:43 +00:00
|
|
|
{
|
|
|
|
wxASSERT( aBusConnection->IsBus() );
|
|
|
|
|
|
|
|
SCH_CONNECTION* match = nullptr;
|
|
|
|
|
2020-01-18 20:51:28 +00:00
|
|
|
if( aBusConnection->Type() == CONNECTION_TYPE::BUS )
|
2019-05-05 23:48:43 +00:00
|
|
|
{
|
|
|
|
// Vector bus: compare against index, because we allow the name
|
|
|
|
// to be different
|
|
|
|
|
|
|
|
for( const auto& bus_member : aBusConnection->Members() )
|
|
|
|
{
|
|
|
|
if( bus_member->VectorIndex() == aSearch->VectorIndex() )
|
|
|
|
{
|
|
|
|
match = bus_member.get();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Group bus
|
|
|
|
for( const auto& c : aBusConnection->Members() )
|
|
|
|
{
|
|
|
|
// Vector inside group: compare names, because for bus groups
|
|
|
|
// we expect the naming to be consistent across all usages
|
|
|
|
// TODO(JE) explain this in the docs
|
2020-01-18 20:51:28 +00:00
|
|
|
if( c->Type() == CONNECTION_TYPE::BUS )
|
2019-05-05 23:48:43 +00:00
|
|
|
{
|
|
|
|
for( const auto& bus_member : c->Members() )
|
|
|
|
{
|
2020-02-05 14:23:55 +00:00
|
|
|
if( bus_member->LocalName() == aSearch->LocalName() )
|
2019-05-05 23:48:43 +00:00
|
|
|
{
|
|
|
|
match = bus_member.get();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-02-05 14:23:55 +00:00
|
|
|
else if( c->LocalName() == aSearch->LocalName() )
|
2019-05-05 23:48:43 +00:00
|
|
|
{
|
|
|
|
match = c.get();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return match;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-07-09 22:14:27 +00:00
|
|
|
void CONNECTION_GRAPH::recacheSubgraphName( CONNECTION_SUBGRAPH* aSubgraph,
|
|
|
|
const wxString& aOldName )
|
2019-05-05 23:48:43 +00:00
|
|
|
{
|
|
|
|
if( m_net_name_to_subgraphs_map.count( aOldName ) )
|
|
|
|
{
|
|
|
|
auto& vec = m_net_name_to_subgraphs_map.at( aOldName );
|
|
|
|
vec.erase( std::remove( vec.begin(), vec.end(), aSubgraph ), vec.end() );
|
|
|
|
}
|
|
|
|
|
2020-02-05 14:23:55 +00:00
|
|
|
wxLogTrace( "CONN", "recacheSubgraphName: %s => %s", aOldName,
|
|
|
|
aSubgraph->m_driver_connection->Name() );
|
|
|
|
|
2019-05-05 23:48:43 +00:00
|
|
|
m_net_name_to_subgraphs_map[aSubgraph->m_driver_connection->Name()].push_back( aSubgraph );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
std::shared_ptr<BUS_ALIAS> CONNECTION_GRAPH::GetBusAlias( const wxString& aName )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-03 09:14:36 +00:00
|
|
|
if( m_bus_alias_cache.count( aName ) )
|
2019-03-11 21:32:05 +00:00
|
|
|
return m_bus_alias_cache.at( aName );
|
2019-04-03 09:14:36 +00:00
|
|
|
|
|
|
|
return nullptr;
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
std::vector<const CONNECTION_SUBGRAPH*> CONNECTION_GRAPH::GetBusesNeedingMigration()
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-20 01:45:33 +00:00
|
|
|
std::vector<const CONNECTION_SUBGRAPH*> ret;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
for( auto&& subgraph : m_subgraphs )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
|
|
|
// Graph is supposed to be up-to-date before calling this
|
|
|
|
wxASSERT( !subgraph->m_dirty );
|
|
|
|
|
|
|
|
if( !subgraph->m_driver )
|
|
|
|
continue;
|
|
|
|
|
|
|
|
auto sheet = subgraph->m_sheet;
|
|
|
|
auto connection = subgraph->m_driver->Connection( sheet );
|
|
|
|
|
|
|
|
if( !connection->IsBus() )
|
|
|
|
continue;
|
|
|
|
|
2019-04-20 02:03:18 +00:00
|
|
|
auto labels = subgraph->GetBusLabels();
|
|
|
|
|
|
|
|
if( labels.size() > 1 )
|
2019-03-23 19:43:33 +00:00
|
|
|
{
|
2019-04-20 02:03:18 +00:00
|
|
|
bool different = false;
|
2020-04-24 18:56:17 +00:00
|
|
|
wxString first = static_cast<SCH_TEXT*>( labels.at( 0 ) )->GetShownText();
|
2019-04-20 02:03:18 +00:00
|
|
|
|
|
|
|
for( unsigned i = 1; i < labels.size(); ++i )
|
|
|
|
{
|
2020-04-24 18:56:17 +00:00
|
|
|
if( static_cast<SCH_TEXT*>( labels.at( i ) )->GetShownText() != first )
|
2019-04-20 02:03:18 +00:00
|
|
|
{
|
|
|
|
different = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( !different )
|
|
|
|
continue;
|
|
|
|
|
2019-04-03 02:58:11 +00:00
|
|
|
wxLogTrace( "CONN", "SG %ld (%s) has multiple bus labels", subgraph->m_code,
|
2019-03-23 19:43:33 +00:00
|
|
|
connection->Name() );
|
|
|
|
|
2019-03-11 21:32:05 +00:00
|
|
|
ret.push_back( subgraph );
|
2019-03-23 19:43:33 +00:00
|
|
|
}
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-05-21 03:40:31 +00:00
|
|
|
CONNECTION_SUBGRAPH* CONNECTION_GRAPH::FindSubgraphByName(
|
|
|
|
const wxString& aNetName, const SCH_SHEET_PATH& aPath )
|
|
|
|
{
|
|
|
|
if( !m_net_name_to_subgraphs_map.count( aNetName ) )
|
|
|
|
return nullptr;
|
|
|
|
|
|
|
|
for( auto sg : m_net_name_to_subgraphs_map.at( aNetName ) )
|
|
|
|
{
|
|
|
|
// Cache is supposed to be valid by now
|
|
|
|
wxASSERT( sg && !sg->m_absorbed && sg->m_driver_connection );
|
|
|
|
|
|
|
|
if( sg->m_sheet == aPath && sg->m_driver_connection->Name() == aNetName )
|
|
|
|
return sg;
|
|
|
|
}
|
|
|
|
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-05-24 14:46:05 +00:00
|
|
|
CONNECTION_SUBGRAPH* CONNECTION_GRAPH::FindFirstSubgraphByName( const wxString& aNetName )
|
|
|
|
{
|
|
|
|
if( !m_net_name_to_subgraphs_map.count( aNetName ) )
|
|
|
|
return nullptr;
|
|
|
|
|
|
|
|
wxASSERT( !m_net_name_to_subgraphs_map.at( aNetName ).empty() );
|
|
|
|
|
|
|
|
return m_net_name_to_subgraphs_map.at( aNetName )[0];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
CONNECTION_SUBGRAPH* CONNECTION_GRAPH::GetSubgraphForItem( SCH_ITEM* aItem )
|
|
|
|
{
|
|
|
|
if( !m_item_to_subgraph_map.count( aItem ) )
|
|
|
|
return nullptr;
|
|
|
|
|
|
|
|
CONNECTION_SUBGRAPH* ret = m_item_to_subgraph_map.at( aItem );
|
|
|
|
|
|
|
|
while( ret->m_absorbed )
|
|
|
|
ret = ret->m_absorbed_by;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-03-10 18:46:57 +00:00
|
|
|
int CONNECTION_GRAPH::RunERC()
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2020-03-16 11:05:01 +00:00
|
|
|
int error_count = 0;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
2020-05-13 02:00:37 +00:00
|
|
|
wxCHECK_MSG( m_schematic, true, "Null m_schematic in CONNECTION_GRAPH::ercCheckLabels" );
|
|
|
|
|
2020-06-08 02:19:46 +00:00
|
|
|
ERC_SETTINGS& settings = m_schematic->ErcSettings();
|
2020-05-13 02:00:37 +00:00
|
|
|
|
2019-04-20 01:45:33 +00:00
|
|
|
for( auto&& subgraph : m_subgraphs )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
|
|
|
// Graph is supposed to be up-to-date before calling RunERC()
|
|
|
|
wxASSERT( !subgraph->m_dirty );
|
|
|
|
|
|
|
|
/**
|
|
|
|
* NOTE:
|
|
|
|
*
|
|
|
|
* We could check that labels attached to bus subgraphs follow the
|
|
|
|
* proper format (i.e. actually define a bus).
|
|
|
|
*
|
|
|
|
* This check doesn't need to be here right now because labels
|
|
|
|
* won't actually be connected to bus wires if they aren't in the right
|
|
|
|
* format due to their TestDanglingEnds() implementation.
|
|
|
|
*/
|
|
|
|
|
2020-06-08 02:19:46 +00:00
|
|
|
if( settings.IsTestEnabled( ERCE_DRIVER_CONFLICT ) && !subgraph->ResolveDrivers() )
|
2019-03-11 21:32:05 +00:00
|
|
|
error_count++;
|
|
|
|
|
2020-06-08 02:19:46 +00:00
|
|
|
if( settings.IsTestEnabled( ERCE_BUS_TO_NET_CONFLICT )
|
2020-03-10 18:46:57 +00:00
|
|
|
&& !ercCheckBusToNetConflicts( subgraph ) )
|
2019-03-11 21:32:05 +00:00
|
|
|
error_count++;
|
|
|
|
|
2020-06-08 02:19:46 +00:00
|
|
|
if( settings.IsTestEnabled( ERCE_BUS_ENTRY_CONFLICT )
|
2020-03-10 18:46:57 +00:00
|
|
|
&& !ercCheckBusToBusEntryConflicts( subgraph ) )
|
2019-03-11 21:32:05 +00:00
|
|
|
error_count++;
|
|
|
|
|
2020-06-08 02:19:46 +00:00
|
|
|
if( settings.IsTestEnabled( ERCE_BUS_TO_BUS_CONFLICT )
|
2020-03-10 18:46:57 +00:00
|
|
|
&& !ercCheckBusToBusConflicts( subgraph ) )
|
2019-03-11 21:32:05 +00:00
|
|
|
error_count++;
|
|
|
|
|
|
|
|
// The following checks are always performed since they don't currently
|
|
|
|
// have an option exposed to the user
|
|
|
|
|
2020-03-10 18:46:57 +00:00
|
|
|
if( !ercCheckNoConnects( subgraph ) )
|
2019-03-11 21:32:05 +00:00
|
|
|
error_count++;
|
|
|
|
|
2020-06-08 02:19:46 +00:00
|
|
|
if( ( settings.IsTestEnabled( ERCE_LABEL_NOT_CONNECTED )
|
|
|
|
|| settings.IsTestEnabled( ERCE_GLOBLABEL ) ) && !ercCheckLabels( subgraph ) )
|
2019-03-11 21:32:05 +00:00
|
|
|
error_count++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return error_count;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-03-10 18:46:57 +00:00
|
|
|
bool CONNECTION_GRAPH::ercCheckBusToNetConflicts( const CONNECTION_SUBGRAPH* aSubgraph )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
|
|
|
auto sheet = aSubgraph->m_sheet;
|
|
|
|
auto screen = sheet.LastScreen();
|
|
|
|
|
|
|
|
SCH_ITEM* net_item = nullptr;
|
|
|
|
SCH_ITEM* bus_item = nullptr;
|
2020-05-19 02:58:28 +00:00
|
|
|
SCH_CONNECTION conn( this );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
for( auto item : aSubgraph->m_items )
|
|
|
|
{
|
|
|
|
switch( item->Type() )
|
|
|
|
{
|
|
|
|
case SCH_LINE_T:
|
|
|
|
{
|
|
|
|
if( item->GetLayer() == LAYER_BUS )
|
|
|
|
bus_item = ( !bus_item ) ? item : bus_item;
|
|
|
|
else
|
|
|
|
net_item = ( !net_item ) ? item : net_item;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SCH_GLOBAL_LABEL_T:
|
|
|
|
case SCH_SHEET_PIN_T:
|
2019-04-15 23:56:41 +00:00
|
|
|
case SCH_HIER_LABEL_T:
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2020-07-06 10:51:04 +00:00
|
|
|
SCH_TEXT* text = static_cast<SCH_TEXT*>( item );
|
|
|
|
conn.ConfigureFromLabel( EscapeString( text->GetShownText(), CTX_NETNAME ) );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
if( conn.IsBus() )
|
|
|
|
bus_item = ( !bus_item ) ? item : bus_item;
|
|
|
|
else
|
|
|
|
net_item = ( !net_item ) ? item : net_item;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( net_item && bus_item )
|
|
|
|
{
|
2020-06-08 02:19:46 +00:00
|
|
|
ERC_ITEM* ercItem = ERC_ITEM::Create( ERCE_BUS_TO_NET_CONFLICT );
|
2020-04-24 13:36:10 +00:00
|
|
|
ercItem->SetItems( net_item, bus_item );
|
|
|
|
|
|
|
|
SCH_MARKER* marker = new SCH_MARKER( ercItem, net_item->GetPosition() );
|
2020-03-10 18:46:57 +00:00
|
|
|
screen->Append( marker );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-03-10 18:46:57 +00:00
|
|
|
bool CONNECTION_GRAPH::ercCheckBusToBusConflicts( const CONNECTION_SUBGRAPH* aSubgraph )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
|
|
|
wxString msg;
|
|
|
|
auto sheet = aSubgraph->m_sheet;
|
|
|
|
auto screen = sheet.LastScreen();
|
|
|
|
|
|
|
|
SCH_ITEM* label = nullptr;
|
|
|
|
SCH_ITEM* port = nullptr;
|
|
|
|
|
|
|
|
for( auto item : aSubgraph->m_items )
|
|
|
|
{
|
|
|
|
switch( item->Type() )
|
|
|
|
{
|
|
|
|
case SCH_TEXT_T:
|
|
|
|
case SCH_GLOBAL_LABEL_T:
|
|
|
|
{
|
|
|
|
if( !label && item->Connection( sheet )->IsBus() )
|
|
|
|
label = item;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SCH_SHEET_PIN_T:
|
2019-04-15 23:56:41 +00:00
|
|
|
case SCH_HIER_LABEL_T:
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
|
|
|
if( !port && item->Connection( sheet )->IsBus() )
|
|
|
|
port = item;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( label && port )
|
|
|
|
{
|
|
|
|
bool match = false;
|
|
|
|
|
2019-04-03 09:14:36 +00:00
|
|
|
for( const auto& member : label->Connection( sheet )->Members() )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-03 09:14:36 +00:00
|
|
|
for( const auto& test : port->Connection( sheet )->Members() )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
|
|
|
if( test != member && member->Name() == test->Name() )
|
|
|
|
{
|
|
|
|
match = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( match )
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( !match )
|
|
|
|
{
|
2020-06-08 02:19:46 +00:00
|
|
|
ERC_ITEM* ercItem = ERC_ITEM::Create( ERCE_BUS_TO_BUS_CONFLICT );
|
2020-04-24 13:36:10 +00:00
|
|
|
ercItem->SetItems( label, port );
|
|
|
|
|
|
|
|
SCH_MARKER* marker = new SCH_MARKER( ercItem, label->GetPosition() );
|
2020-03-10 18:46:57 +00:00
|
|
|
screen->Append( marker );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-03-10 18:46:57 +00:00
|
|
|
bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH* aSubgraph )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
|
|
|
bool conflict = false;
|
|
|
|
auto sheet = aSubgraph->m_sheet;
|
|
|
|
auto screen = sheet.LastScreen();
|
|
|
|
|
|
|
|
SCH_BUS_WIRE_ENTRY* bus_entry = nullptr;
|
|
|
|
SCH_ITEM* bus_wire = nullptr;
|
|
|
|
|
|
|
|
for( auto item : aSubgraph->m_items )
|
|
|
|
{
|
|
|
|
switch( item->Type() )
|
|
|
|
{
|
|
|
|
case SCH_BUS_WIRE_ENTRY_T:
|
|
|
|
{
|
|
|
|
if( !bus_entry )
|
|
|
|
bus_entry = static_cast<SCH_BUS_WIRE_ENTRY*>( item );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( bus_entry && bus_entry->m_connected_bus_item )
|
|
|
|
{
|
|
|
|
bus_wire = bus_entry->m_connected_bus_item;
|
|
|
|
|
2019-12-23 13:55:47 +00:00
|
|
|
wxASSERT( bus_wire->Type() == SCH_LINE_T );
|
|
|
|
|
2019-12-22 15:19:05 +00:00
|
|
|
// In some cases, the connection list (SCH_CONNECTION*) can be null.
|
|
|
|
// Skip null connections.
|
2019-12-23 13:55:47 +00:00
|
|
|
if( bus_entry->Connection( sheet ) && bus_wire->Type() == SCH_LINE_T
|
|
|
|
&& bus_wire->Connection( sheet ) )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-12-22 15:19:05 +00:00
|
|
|
conflict = true;
|
|
|
|
|
|
|
|
auto test_name = bus_entry->Connection( sheet )->Name( true );
|
|
|
|
|
|
|
|
for( const auto& member : bus_wire->Connection( sheet )->Members() )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2020-01-18 20:51:28 +00:00
|
|
|
if( member->Type() == CONNECTION_TYPE::BUS )
|
2019-12-22 15:19:05 +00:00
|
|
|
{
|
|
|
|
for( const auto& sub_member : member->Members() )
|
2020-03-16 11:05:01 +00:00
|
|
|
{
|
2019-12-22 15:19:05 +00:00
|
|
|
if( sub_member->Name( true ) == test_name )
|
|
|
|
conflict = false;
|
2020-03-16 11:05:01 +00:00
|
|
|
}
|
2019-12-22 15:19:05 +00:00
|
|
|
}
|
|
|
|
else if( member->Name( true ) == test_name )
|
|
|
|
{
|
|
|
|
conflict = false;
|
|
|
|
}
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-03 03:09:02 +00:00
|
|
|
// Don't report warnings if this bus member has been overridden by a higher priority power pin
|
|
|
|
// or global label
|
2020-03-16 11:05:01 +00:00
|
|
|
if( conflict && CONNECTION_SUBGRAPH::GetDriverPriority( aSubgraph->m_driver )
|
2020-01-03 03:09:02 +00:00
|
|
|
>= CONNECTION_SUBGRAPH::PRIORITY::POWER_PIN )
|
|
|
|
conflict = false;
|
|
|
|
|
2019-03-11 21:32:05 +00:00
|
|
|
if( conflict )
|
|
|
|
{
|
2020-06-08 02:19:46 +00:00
|
|
|
ERC_ITEM* ercItem = ERC_ITEM::Create( ERCE_BUS_ENTRY_CONFLICT );
|
2020-04-24 13:36:10 +00:00
|
|
|
ercItem->SetItems( bus_entry, bus_wire );
|
|
|
|
|
|
|
|
SCH_MARKER* marker = new SCH_MARKER( ercItem, bus_entry->GetPosition() );
|
2020-03-10 18:46:57 +00:00
|
|
|
screen->Append( marker );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// TODO(JE) Check sheet pins here too?
|
2020-03-10 18:46:57 +00:00
|
|
|
bool CONNECTION_GRAPH::ercCheckNoConnects( const CONNECTION_SUBGRAPH* aSubgraph )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
|
|
|
wxString msg;
|
|
|
|
auto sheet = aSubgraph->m_sheet;
|
|
|
|
auto screen = sheet.LastScreen();
|
|
|
|
|
|
|
|
if( aSubgraph->m_no_connect != nullptr )
|
|
|
|
{
|
|
|
|
bool has_invalid_items = false;
|
2019-04-12 01:22:19 +00:00
|
|
|
bool has_other_items = false;
|
2019-04-03 09:14:36 +00:00
|
|
|
SCH_PIN* pin = nullptr;
|
2019-03-11 21:32:05 +00:00
|
|
|
std::vector<SCH_ITEM*> invalid_items;
|
|
|
|
|
|
|
|
// Any subgraph that contains both a pin and a no-connect should not
|
2019-04-12 01:22:19 +00:00
|
|
|
// contain any other driving items.
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
for( auto item : aSubgraph->m_items )
|
|
|
|
{
|
|
|
|
switch( item->Type() )
|
|
|
|
{
|
2019-04-03 09:14:36 +00:00
|
|
|
case SCH_PIN_T:
|
|
|
|
pin = static_cast<SCH_PIN*>( item );
|
2019-04-12 01:22:19 +00:00
|
|
|
has_other_items = true;
|
2019-03-11 21:32:05 +00:00
|
|
|
break;
|
|
|
|
|
2019-04-12 01:22:19 +00:00
|
|
|
case SCH_LINE_T:
|
|
|
|
case SCH_JUNCTION_T:
|
2019-03-11 21:32:05 +00:00
|
|
|
case SCH_NO_CONNECT_T:
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
has_invalid_items = true;
|
2019-04-12 01:22:19 +00:00
|
|
|
has_other_items = true;
|
2019-03-11 21:32:05 +00:00
|
|
|
invalid_items.push_back( item );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( pin && has_invalid_items )
|
|
|
|
{
|
2020-06-08 02:19:46 +00:00
|
|
|
ERC_ITEM* ercItem = ERC_ITEM::Create( ERCE_NOCONNECT_CONNECTED );
|
2020-04-24 13:36:10 +00:00
|
|
|
ercItem->SetItems( pin );
|
|
|
|
|
|
|
|
SCH_MARKER* marker = new SCH_MARKER( ercItem, pin->GetTransformedPosition() );
|
2020-03-10 18:46:57 +00:00
|
|
|
screen->Append( marker );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
2019-04-12 01:22:19 +00:00
|
|
|
|
|
|
|
if( !has_other_items )
|
|
|
|
{
|
2020-06-08 02:19:46 +00:00
|
|
|
ERC_ITEM* ercItem = ERC_ITEM::Create( ERCE_NOCONNECT_NOT_CONNECTED );
|
2020-04-24 13:36:10 +00:00
|
|
|
ercItem->SetItems( aSubgraph->m_no_connect );
|
|
|
|
|
|
|
|
SCH_MARKER* marker = new SCH_MARKER( ercItem, aSubgraph->m_no_connect->GetPosition() );
|
2020-03-10 18:46:57 +00:00
|
|
|
screen->Append( marker );
|
2019-04-12 01:22:19 +00:00
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
2019-03-11 21:32:05 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
bool has_other_connections = false;
|
2019-04-03 09:14:36 +00:00
|
|
|
SCH_PIN* pin = nullptr;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
// Any subgraph that lacks a no-connect and contains a pin should also
|
|
|
|
// contain at least one other connectable item.
|
|
|
|
|
|
|
|
for( auto item : aSubgraph->m_items )
|
|
|
|
{
|
|
|
|
switch( item->Type() )
|
|
|
|
{
|
2019-04-03 09:14:36 +00:00
|
|
|
case SCH_PIN_T:
|
2019-03-11 21:32:05 +00:00
|
|
|
if( !pin )
|
2019-04-03 09:14:36 +00:00
|
|
|
pin = static_cast<SCH_PIN*>( item );
|
2019-03-11 21:32:05 +00:00
|
|
|
else
|
|
|
|
has_other_connections = true;
|
2019-08-07 18:23:59 +00:00
|
|
|
|
2019-03-11 21:32:05 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
if( item->IsConnectable() )
|
|
|
|
has_other_connections = true;
|
2019-08-07 18:23:59 +00:00
|
|
|
|
2019-03-11 21:32:05 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-07 18:23:59 +00:00
|
|
|
// Check if invisible power pins connect to anything else.
|
|
|
|
// Note this won't catch a component with multiple invisible power pins but these don't
|
|
|
|
// connect to any other net; maybe that should be added as a further optional ERC check?
|
2019-04-08 01:33:47 +00:00
|
|
|
|
2019-08-07 18:23:59 +00:00
|
|
|
if( pin && !has_other_connections && pin->IsPowerConnection() && !pin->IsVisible() )
|
2019-04-08 01:33:47 +00:00
|
|
|
{
|
|
|
|
wxString name = pin->Connection( sheet )->Name();
|
2019-04-12 01:22:19 +00:00
|
|
|
wxString local_name = pin->Connection( sheet )->Name( true );
|
2019-04-08 01:33:47 +00:00
|
|
|
|
2019-04-12 01:22:19 +00:00
|
|
|
if( m_global_label_cache.count( name ) ||
|
|
|
|
( m_local_label_cache.count( std::make_pair( sheet, local_name ) ) ) )
|
2019-04-08 01:33:47 +00:00
|
|
|
{
|
2019-04-12 01:22:19 +00:00
|
|
|
has_other_connections = true;
|
2019-04-08 01:33:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-18 20:51:28 +00:00
|
|
|
if( pin && !has_other_connections && pin->GetType() != ELECTRICAL_PINTYPE::PT_NC )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2020-06-08 02:19:46 +00:00
|
|
|
ERC_ITEM* ercItem = ERC_ITEM::Create( ERCE_PIN_NOT_CONNECTED );
|
2020-04-24 13:36:10 +00:00
|
|
|
ercItem->SetItems( pin );
|
|
|
|
|
|
|
|
SCH_MARKER* marker = new SCH_MARKER( ercItem, pin->GetTransformedPosition() );
|
2020-03-10 18:46:57 +00:00
|
|
|
screen->Append( marker );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-03-10 18:46:57 +00:00
|
|
|
bool CONNECTION_GRAPH::ercCheckLabels( const CONNECTION_SUBGRAPH* aSubgraph )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2019-04-25 19:10:19 +00:00
|
|
|
// Label connection rules:
|
|
|
|
// Local labels are flagged if they don't connect to any pins and don't have a no-connect
|
|
|
|
// Global labels are flagged if they appear only once, don't connect to any local labels,
|
|
|
|
// and don't have a no-connect marker
|
|
|
|
|
|
|
|
// So, if there is a no-connect, we will never generate a warning here
|
|
|
|
if( aSubgraph->m_no_connect )
|
|
|
|
return true;
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
SCH_TEXT* text = nullptr;
|
|
|
|
bool has_other_connections = false;
|
|
|
|
|
|
|
|
for( auto item : aSubgraph->m_items )
|
|
|
|
{
|
|
|
|
switch( item->Type() )
|
|
|
|
{
|
|
|
|
case SCH_LABEL_T:
|
|
|
|
case SCH_GLOBAL_LABEL_T:
|
2019-04-15 23:56:41 +00:00
|
|
|
case SCH_HIER_LABEL_T:
|
2019-03-11 21:32:05 +00:00
|
|
|
text = static_cast<SCH_TEXT*>( item );
|
|
|
|
break;
|
|
|
|
|
2019-04-03 09:14:36 +00:00
|
|
|
case SCH_PIN_T:
|
2019-04-25 19:10:19 +00:00
|
|
|
case SCH_SHEET_PIN_T:
|
2019-03-23 19:43:33 +00:00
|
|
|
has_other_connections = true;
|
|
|
|
break;
|
|
|
|
|
2019-03-11 21:32:05 +00:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-05-02 00:15:08 +00:00
|
|
|
if( !text )
|
|
|
|
return true;
|
|
|
|
|
|
|
|
bool is_global = text->Type() == SCH_GLOBAL_LABEL_T;
|
2019-04-25 19:10:19 +00:00
|
|
|
|
2020-05-13 02:00:37 +00:00
|
|
|
wxCHECK_MSG( m_schematic, true, "Null m_schematic in CONNECTION_GRAPH::ercCheckLabels" );
|
|
|
|
|
2019-04-25 19:10:19 +00:00
|
|
|
// Global label check can be disabled independently
|
2020-06-08 02:19:46 +00:00
|
|
|
if( !m_schematic->ErcSettings().IsTestEnabled( ERCE_GLOBLABEL ) && is_global )
|
2019-04-25 19:10:19 +00:00
|
|
|
return true;
|
|
|
|
|
2020-07-06 10:51:04 +00:00
|
|
|
wxString name = EscapeString( text->GetShownText(), CTX_NETNAME );
|
2019-05-02 00:15:08 +00:00
|
|
|
|
2020-03-16 11:05:01 +00:00
|
|
|
if( is_global )
|
2019-04-25 19:10:19 +00:00
|
|
|
{
|
2019-05-02 00:15:08 +00:00
|
|
|
// This will be set to true if the global is connected to a pin above, but we
|
|
|
|
// want to reset this to false so that globals get flagged if they only have a
|
|
|
|
// single instance
|
|
|
|
has_other_connections = false;
|
2019-04-25 19:10:19 +00:00
|
|
|
|
2019-05-02 00:15:08 +00:00
|
|
|
if( m_net_name_to_subgraphs_map.count( name )
|
|
|
|
&& m_net_name_to_subgraphs_map.at( name ).size() > 1 )
|
|
|
|
has_other_connections = true;
|
|
|
|
}
|
2020-03-16 11:05:01 +00:00
|
|
|
else if( text->Type() == SCH_HIER_LABEL_T )
|
2019-11-30 02:10:16 +00:00
|
|
|
{
|
|
|
|
// For a hier label, check if the parent pin is connected
|
2020-03-16 11:05:01 +00:00
|
|
|
if( aSubgraph->m_hier_parent &&
|
|
|
|
( aSubgraph->m_hier_parent->m_strong_driver ||
|
2019-11-30 02:10:16 +00:00
|
|
|
aSubgraph->m_hier_parent->m_drivers.size() > 1))
|
|
|
|
{
|
|
|
|
// For now, a simple check: if there is more than one driver, the parent is probably
|
|
|
|
// connected elsewhere (because at least one driver will be the hier pin itself)
|
|
|
|
has_other_connections = true;
|
|
|
|
}
|
|
|
|
}
|
2019-05-02 00:15:08 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
auto pair = std::make_pair( aSubgraph->m_sheet, name );
|
2019-04-25 19:31:44 +00:00
|
|
|
|
2019-05-02 00:15:08 +00:00
|
|
|
if( m_local_label_cache.count( pair ) && m_local_label_cache.at( pair ).size() > 1 )
|
|
|
|
has_other_connections = true;
|
2019-04-25 19:10:19 +00:00
|
|
|
}
|
|
|
|
|
2019-05-02 00:15:08 +00:00
|
|
|
if( !has_other_connections )
|
2019-03-11 21:32:05 +00:00
|
|
|
{
|
2020-06-08 02:19:46 +00:00
|
|
|
ERC_ITEM* ercItem = ERC_ITEM::Create( is_global ? ERCE_GLOBLABEL : ERCE_LABEL_NOT_CONNECTED );
|
2020-04-24 13:36:10 +00:00
|
|
|
ercItem->SetItems( text );
|
|
|
|
|
|
|
|
SCH_MARKER* marker = new SCH_MARKER( ercItem, text->GetPosition() );
|
2020-03-16 11:05:01 +00:00
|
|
|
aSubgraph->m_sheet.LastScreen()->Append( marker );
|
2019-03-11 21:32:05 +00:00
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|