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

Don't do hole-to-pad clearance testing on compound pads. 

Fixes https://gitlab.com/kicad/code/kicad/issues/5822
This commit is contained in:
Jeff Young 2020-09-29 13:07:55 +01:00
parent d70f812255
commit 66454ec895
3 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pcbnew/class_pad.h
View File

@ -137,9 +137,16 @@ public:
void SetPinFunction( const wxString& aName ) { m_pinFunction = aName; } void SetPinFunction( const wxString& aName ) { m_pinFunction = aName; }
const wxString& GetPinFunction() const { return m_pinFunction; } const wxString& GetPinFunction() const { return m_pinFunction; }
bool PadNameEqual( const D_PAD* other ) const /**
* Before we had custom pad shapes it was common to have multiple overlapping pads to
* represent a more complex shape.
* @param other
* @return
*/
bool SameLogicalPadAs( const D_PAD* other ) const
{ {
return m_name == other->m_name; // hide tricks behind sensible API // hide tricks behind sensible API
return GetParent() == other->GetParent() && m_name == other->m_name;
} }
/** /**

2
pcbnew/drc/drc_test_provider_copper_clearance.cpp
View File

@ -601,7 +601,7 @@ void DRC_TEST_PROVIDER_COPPER_CLEARANCE::doPadToPadsDrc( int aRefPadIdx,
continue; continue;
// If pads are equivalent (ie: from the same footprint with the same pad number)... // If pads are equivalent (ie: from the same footprint with the same pad number)...
if( pad->GetParent() == refPad->GetParent() && pad->PadNameEqual( refPad ) ) if( pad->SameLogicalPadAs( refPad ) )
{ {
// ...and have nets, then they must be the same net // ...and have nets, then they must be the same net
if( pad->GetNetCode() && refPad->GetNetCode() if( pad->GetNetCode() && refPad->GetNetCode()

33
pcbnew/drc/drc_test_provider_hole_clearance.cpp
View File

@ -227,7 +227,7 @@ bool DRC_TEST_PROVIDER_HOLE_CLEARANCE::doPadToPadHoleDrc( int aRefPadIdx,
{ {
D_PAD* pad = aSortedPadsList[idx]; D_PAD* pad = aSortedPadsList[idx];
if( pad == refPad ) if( pad == refPad || pad->SameLogicalPadAs( refPad ) )
continue; continue;
// drc_dbg(10," chk against -> %p\n", pad); // drc_dbg(10," chk against -> %p\n", pad);
@ -237,35 +237,15 @@ bool DRC_TEST_PROVIDER_HOLE_CLEARANCE::doPadToPadHoleDrc( int aRefPadIdx,
if( pad->GetPosition().x > aX_limit ) if( pad->GetPosition().x > aX_limit )
break; break;
// drc_dbg( 10," chk2 against -> %p ds %d %d\n",
// pad, pad->GetDrillSize().x, refPad->GetDrillSize().x );
drc_dbg( 10, " chk1 against -> %p x0 %d x2 %d\n", drc_dbg( 10, " chk1 against -> %p x0 %d x2 %d\n",
pad, pad->GetDrillSize().x, refPad->GetDrillSize().x ); pad, pad->GetDrillSize().x, refPad->GetDrillSize().x );
// No problem if pads which are on copper layers are on different copper layers, // Since a hole pierces all layers we have to test pads which are on any copper layer.
// (pads can be only on a technical layer, to build complex pads) // Pads just on technical layers are not an issue.
// but their hole (if any ) can create DRC error because they are on all if( ( pad->GetLayerSet() & all_cu ) != 0 || ( refPad->GetLayerSet() & all_cu ) != 0 )
// copper layers, so we test them
if( ( pad->GetLayerSet() & layerMask ) != 0 &&
( pad->GetLayerSet() & all_cu ) != 0 &&
( refPad->GetLayerSet() & all_cu ) != 0 )
{ {
// if holes are in the same location and have the same size and shape, drc_dbg( 10, " chk3 against -> %p x0 %d x2 %d\n", pad, pad->GetDrillSize().x,
// this can be accepted refPad->GetDrillSize().x );
if( pad->GetPosition() == refPad->GetPosition()
&& pad->GetDrillSize() == refPad->GetDrillSize()
&& pad->GetDrillShape() == refPad->GetDrillShape() )
{
if( refPad->GetDrillShape() == PAD_DRILL_SHAPE_CIRCLE )
continue;
// for oval holes: must also have the same orientation
if( pad->GetOrientation() == refPad->GetOrientation() )
continue;
}
drc_dbg(10, " chk3 against -> %p x0 %d x2 %d\n", pad, pad->GetDrillSize().x, refPad->GetDrillSize().x );
if( pad->GetDrillSize().x ) // test pad has a hole if( pad->GetDrillSize().x ) // test pad has a hole
{ {
@ -302,7 +282,6 @@ bool DRC_TEST_PROVIDER_HOLE_CLEARANCE::doPadToPadHoleDrc( int aRefPadIdx,
if( refPad->GetDrillSize().x ) // reference pad has a hole if( refPad->GetDrillSize().x ) // reference pad has a hole
{ {
auto constraint = m_drcEngine->EvalRulesForItems( DRC_CONSTRAINT_TYPE_HOLE_CLEARANCE, auto constraint = m_drcEngine->EvalRulesForItems( DRC_CONSTRAINT_TYPE_HOLE_CLEARANCE,
refPad, pad ); refPad, pad );
int minClearance = constraint.GetValue().Min(); int minClearance = constraint.GetValue().Min();