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

Include DRC Epsilon in connection width checker 

Avoids rounding errors flagging connections too small by nanometers

(cherry picked from commit bce560d05f)
This commit is contained in:
Seth Hillbrand 2024-05-22 16:15:02 -07:00
parent 4440fe0935
commit 1073ca0760
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pcbnew/drc/drc_test_provider_connection_width.cpp
View File

@ -503,12 +503,7 @@ private:
// z-order range for the current point ± limit bounding box // z-order range for the current point ± limit bounding box
const int32_t maxZ = zOrder( aPt->x + m_limit, aPt->y + m_limit ); const int32_t maxZ = zOrder( aPt->x + m_limit, aPt->y + m_limit );
const int32_t minZ = zOrder( aPt->x - m_limit, aPt->y - m_limit ); const int32_t minZ = zOrder( aPt->x - m_limit, aPt->y - m_limit );
const SEG::ecoord limit2 = SEG::Square( m_limit );
// Subtract 1 to account for rounding inaccuracies in SquaredEuclideanNorm()
// below. We would usually test for rounding in the final value but since we
// are working in squared integers here, we allow the 1nm slop rather than
// force a separate calculation
const SEG::ecoord limit2 = SEG::Square( m_limit - 1 );
// first look for points in increasing z-order // first look for points in increasing z-order
Vertex* p = aPt->nextZ; Vertex* p = aPt->nextZ;
@ -521,7 +516,7 @@ private:
VECTOR2D diff( p->x - aPt->x, p->y - aPt->y ); VECTOR2D diff( p->x - aPt->x, p->y - aPt->y );
SEG::ecoord dist2 = diff.SquaredEuclideanNorm(); SEG::ecoord dist2 = diff.SquaredEuclideanNorm();
if( delta_i > 1 && dist2 < limit2 && dist2 < min_dist && dist2 > 0.0 if( delta_i > 1 && dist2 < limit2 && dist2 < min_dist && dist2 > 0
&& locallyInside( p, aPt ) && isSubstantial( p, aPt ) && isSubstantial( aPt, p ) ) && locallyInside( p, aPt ) && isSubstantial( p, aPt ) && isSubstantial( aPt, p ) )
{ {
min_dist = dist2; min_dist = dist2;
@ -539,7 +534,7 @@ private:
VECTOR2D diff( p->x - aPt->x, p->y - aPt->y ); VECTOR2D diff( p->x - aPt->x, p->y - aPt->y );
SEG::ecoord dist2 = diff.SquaredEuclideanNorm(); SEG::ecoord dist2 = diff.SquaredEuclideanNorm();
if( delta_i > 1 && dist2 < limit2 && dist2 < min_dist && dist2 > 0.0 if( delta_i > 1 && dist2 < limit2 && dist2 < min_dist && dist2 > 0
&& locallyInside( p, aPt ) && isSubstantial( p, aPt ) && isSubstantial( aPt, p ) ) && locallyInside( p, aPt ) && isSubstantial( p, aPt ) && isSubstantial( aPt, p ) )
{ {
min_dist = dist2; min_dist = dist2;
@ -856,11 +851,17 @@ bool DRC_TEST_PROVIDER_CONNECTION_WIDTH::Run()
returns.clear(); returns.clear();
returns.reserve( dataset.size() * distinctMinWidths.size() ); returns.reserve( dataset.size() * distinctMinWidths.size() );
int epsilon = board->GetDesignSettings().GetDRCEpsilon();
for( const auto& [ netLayer, itemsPoly ] : dataset ) for( const auto& [ netLayer, itemsPoly ] : dataset )
{ {
for( int minWidth : distinctMinWidths ) for( int minWidth : distinctMinWidths )
{
if( ( minWidth -= epsilon ) <= 0 )
continue;
returns.emplace_back( tp.submit( min_checker, itemsPoly, netLayer.Layer, minWidth ) ); returns.emplace_back( tp.submit( min_checker, itemsPoly, netLayer.Layer, minWidth ) );
}
} }
for( std::future<size_t>& ret : returns ) for( std::future<size_t>& ret : returns )