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

Don't report reasonable solder mask bridges in a net-tie footprint.

This commit is contained in:
Jeff Young 2024-06-15 15:56:54 +01:00
parent fa235116f7
commit eae85742cc
1 changed files with 48 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
pcbnew/drc/drc_test_provider_solder_mask.cpp
View File

@ -364,6 +364,8 @@ bool DRC_TEST_PROVIDER_SOLDER_MASK::checkMaskAperture( BOARD_ITEM* aMaskItem, BO
if( aTestLayer == B_Mask && !aTestItem->IsOnLayer( B_Cu ) ) if( aTestLayer == B_Mask && !aTestItem->IsOnLayer( B_Cu ) )
return false; return false;
PCB_LAYER_ID maskLayer = IsFrontLayer( aTestLayer ) ? F_Mask : B_Mask;
FOOTPRINT* fp = aMaskItem->GetParentFootprint(); FOOTPRINT* fp = aMaskItem->GetParentFootprint();
if( fp && ( fp->GetAttributes() & FP_ALLOW_SOLDERMASK_BRIDGES ) > 0 ) if( fp && ( fp->GetAttributes() & FP_ALLOW_SOLDERMASK_BRIDGES ) > 0 )
@ -372,7 +374,7 @@ bool DRC_TEST_PROVIDER_SOLDER_MASK::checkMaskAperture( BOARD_ITEM* aMaskItem, BO
return false; return false;
} }
PTR_LAYER_CACHE_KEY key = { aMaskItem, aTestLayer }; PTR_LAYER_CACHE_KEY key = { aMaskItem, maskLayer };
auto ii = m_maskApertureNetMap.find( key ); auto ii = m_maskApertureNetMap.find( key );
@ -384,22 +386,48 @@ bool DRC_TEST_PROVIDER_SOLDER_MASK::checkMaskAperture( BOARD_ITEM* aMaskItem, BO
return false; return false;
} }
if( ii->second.second == aTestNet && aTestNet > 0 ) auto& [cacheKey, cacheEntry] = *ii;
auto& [alreadyEncounteredItem, encounteredItemNet] = cacheEntry;
if( encounteredItemNet == aTestNet && aTestNet >= 0 )
{ {
// Same net; still no bridge... // Same net; still no bridge...
return false; return false;
} }
if( fp && ii->second.first->Type() == PCB_PAD_T && aTestItem->Type() == PCB_PAD_T ) if( fp && fp->IsNetTie() && aTestItem->GetParentFootprint() == fp )
{ {
PAD* alreadyEncounteredPad = static_cast<PAD*>( ii->second.first ); std::map<wxString, int> padToNetTieGroupMap = fp->MapPadNumbersToNetTieGroups();
PAD* thisPad = static_cast<PAD*>( aTestItem ); PAD* padA = nullptr;
PAD* padB = nullptr;
if( alreadyEncounteredPad->SharesNetTieGroup( thisPad ) ) if( alreadyEncounteredItem->Type() == PCB_PAD_T )
return false; padA = static_cast<PAD*>( alreadyEncounteredItem );
if( aTestItem->Type() == PCB_PAD_T )
padB = static_cast<PAD*>( aTestItem );
if( padA && padB )
{
int netTieGroupA = padToNetTieGroupMap[padA->GetNumber()];
int netTieGroupB = padToNetTieGroupMap[padB->GetNumber()];
if( netTieGroupA >= 0 && netTieGroupA == netTieGroupB )
return false;
}
else if( padA && aTestItem->Type() == PCB_SHAPE_T )
{
if( padToNetTieGroupMap.contains( padA->GetNumber() ) )
return false;
}
else if( padB && alreadyEncounteredItem->Type() == PCB_SHAPE_T )
{
if( padToNetTieGroupMap.contains( padB->GetNumber() ) )
return false;
}
} }
*aCollidingItem = ii->second.first; *aCollidingItem = alreadyEncounteredItem;
return true; return true;
} }
@ -440,8 +468,10 @@ void DRC_TEST_PROVIDER_SOLDER_MASK::testItemAgainstItems( BOARD_ITEM* aItem, con
itemNet = static_cast<BOARD_CONNECTED_ITEM*>( aItem )->GetNetCode(); itemNet = static_cast<BOARD_CONNECTED_ITEM*>( aItem )->GetNetCode();
BOARD_DESIGN_SETTINGS& bds = aItem->GetBoard()->GetDesignSettings(); BOARD_DESIGN_SETTINGS& bds = aItem->GetBoard()->GetDesignSettings();
PAD* pad = dynamic_cast<PAD*>( aItem ); PAD* pad = aItem->Type() == PCB_PAD_T ? static_cast<PAD*>( aItem )
PCB_VIA* via = dynamic_cast<PCB_VIA*>( aItem ); : nullptr;
PCB_VIA* via = aItem->Type() == PCB_VIA_T ? static_cast<PCB_VIA*>( aItem )
: nullptr;
std::shared_ptr<SHAPE> itemShape = aItem->GetEffectiveShape( aRefLayer ); std::shared_ptr<SHAPE> itemShape = aItem->GetEffectiveShape( aRefLayer );
m_itemTree->QueryColliding( aItem, aRefLayer, aTargetLayer, m_itemTree->QueryColliding( aItem, aRefLayer, aTargetLayer,
@ -449,7 +479,8 @@ void DRC_TEST_PROVIDER_SOLDER_MASK::testItemAgainstItems( BOARD_ITEM* aItem, con
[&]( BOARD_ITEM* other ) -> bool [&]( BOARD_ITEM* other ) -> bool
{ {
FOOTPRINT* itemFP = aItem->GetParentFootprint(); FOOTPRINT* itemFP = aItem->GetParentFootprint();
PAD* otherPad = dynamic_cast<PAD*>( other ); PAD* otherPad = other->Type() == PCB_PAD_T ? static_cast<PAD*>( other )
: nullptr;
int otherNet = -1; int otherNet = -1;
if( other->IsConnected() ) if( other->IsConnected() )
@ -500,8 +531,10 @@ void DRC_TEST_PROVIDER_SOLDER_MASK::testItemAgainstItems( BOARD_ITEM* aItem, con
// Visitor: // Visitor:
[&]( BOARD_ITEM* other ) -> bool [&]( BOARD_ITEM* other ) -> bool
{ {
PAD* otherPad = dynamic_cast<PAD*>( other ); PAD* otherPad = other->Type() == PCB_PAD_T ? static_cast<PAD*>( other )
PCB_VIA* otherVia = dynamic_cast<PCB_VIA*>( other ); : nullptr;
PCB_VIA* otherVia = other->Type() == PCB_VIA_T ? static_cast<PCB_VIA*>( other )
: nullptr;
auto otherShape = other->GetEffectiveShape( aTargetLayer ); auto otherShape = other->GetEffectiveShape( aTargetLayer );
int otherNet = -1; int otherNet = -1;
@ -548,7 +581,7 @@ void DRC_TEST_PROVIDER_SOLDER_MASK::testItemAgainstItems( BOARD_ITEM* aItem, con
// two distinct nets. // two distinct nets.
if( isMaskAperture( aItem ) ) if( isMaskAperture( aItem ) )
{ {
if( checkMaskAperture( aItem, other, aTargetLayer, otherNet, &colliding ) ) if( checkMaskAperture( aItem, other, aRefLayer, otherNet, &colliding ) )
{ {
auto drce = DRC_ITEM::Create( DRCE_SOLDERMASK_BRIDGE ); auto drce = DRC_ITEM::Create( DRCE_SOLDERMASK_BRIDGE );
@ -560,7 +593,7 @@ void DRC_TEST_PROVIDER_SOLDER_MASK::testItemAgainstItems( BOARD_ITEM* aItem, con
} }
else if( isMaskAperture( other ) ) else if( isMaskAperture( other ) )
{ {
if( checkMaskAperture( other, aItem, aTargetLayer, itemNet, &colliding ) ) if( checkMaskAperture( other, aItem, aRefLayer, itemNet, &colliding ) )
{ {
auto drce = DRC_ITEM::Create( DRCE_SOLDERMASK_BRIDGE ); auto drce = DRC_ITEM::Create( DRCE_SOLDERMASK_BRIDGE );