AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-20 20:51:42 +00:00
Files Issues Releases Activity

Remove group_matched token from DRC skew rule

Browse Source 
This is the default behaviour anyway
This commit is contained in:
JamesJCode 2024-07-30 14:41:06 +01:00
parent 5705400094
commit 3a007b8dd7
5 changed files with 10 additions and 35 deletions

1
common/drc_rules.keywords
View File

@ -15,7 +15,6 @@ error
exclusion
footprint
graphic
group_matched
hole
hole_clearance
hole_size

8
pcbnew/dialogs/panel_setup_rules.cpp
View File

@ -347,7 +347,11 @@ void PANEL_SETUP_RULES::onScintillaCharAdded( wxStyledTextEvent &aEvent )
if( !sexprs.empty() )
{
// Ignore argument-less tokens
if( partial != wxT( "group_matched" ) && partial != wxT( "within_diff_pairs" ) )
if( partial == wxT( "within_diff_pairs" ) )
{
partial = wxEmptyString;
}
else
{
if( sexprs.top() == wxT( "constraint" ) )
{
@ -439,7 +443,7 @@ void PANEL_SETUP_RULES::onScintillaCharAdded( wxStyledTextEvent &aEvent )
else if( sexprs.top() == wxT( "constraint" ) )
{
if( constraintType == wxT( "skew" ) )
tokens = wxT( "max|min|opt|group_matched|within_diff_pairs" );
tokens = wxT( "max|min|opt|within_diff_pairs" );
else
tokens = wxT( "max|min|opt" );
}

6
pcbnew/drc/drc_rule.h
View File

@ -137,8 +137,7 @@ class DRC_CONSTRAINT
enum class OPTIONS : std::size_t
{
SKEW_GROUP_MATCHED = 0,
SKEW_WITHIN_DIFF_PAIRS = 1
SKEW_WITHIN_DIFF_PAIRS = 0
};
bool IsNull() const
@ -192,7 +191,8 @@ public:
private:
wxString m_name; // For just-in-time constraints
DRC_RULE* m_parentRule; // For constraints found in rules
std::bitset<2> m_options; // Constraint-specific option bits
std::bitset<1> m_options; // Constraint-specific option bits
// (indexed from DRC_CONSTRAINT::OPTIONS)
};

28
pcbnew/drc/drc_rule_parser.cpp
View File

@ -482,28 +482,6 @@ void DRC_RULES_PARSER::parseConstraint( DRC_RULE* aRule )
switch( token )
{
case T_group_matched:
if( c.m_Type != SKEW_CONSTRAINT )
{
reportError( _( "group_matched option invalid for constraint type." ) );
break;
}
if( c.GetOption( DRC_CONSTRAINT::OPTIONS::SKEW_WITHIN_DIFF_PAIRS ) )
{
reportError( _( "within_diff_pairs argument already set for skew constraint." ) );
break;
}
c.SetOption( DRC_CONSTRAINT::OPTIONS::SKEW_GROUP_MATCHED );
if( (int) NextTok() != DSN_RIGHT )
{
reportError( wxString::Format( _( "Unrecognized item '%s'." ), FromUTF8() ) );
parseUnknown();
}
break;
case T_within_diff_pairs:
if( c.m_Type != SKEW_CONSTRAINT )
{
@ -511,12 +489,6 @@ void DRC_RULES_PARSER::parseConstraint( DRC_RULE* aRule )
break;
}
if( c.GetOption( DRC_CONSTRAINT::OPTIONS::SKEW_GROUP_MATCHED ) )
{
reportError( _( "group_matched argument already set for skew constraint." ) );
break;
}
c.SetOption( DRC_CONSTRAINT::OPTIONS::SKEW_WITHIN_DIFF_PAIRS );
if( (int) NextTok() != DSN_RIGHT )

2
qa/data/pcbnew/skew_group_matched_drc.kicad_dru
View File

@ -1,6 +1,6 @@
(version 1)
(rule diff_skew
(constraint skew (max 3mil) (group_matched))
(constraint skew (max 3mil))
(condition "A.hasNetclass('DIFF_PAIR')")
)