Skip to content

K
kicad-source-mirror
Commit 10ded82d authored by lifekidyeaa's avatar lifekidyeaa
Browse files
Options

NET_LABEL should be sheet-local, not global throughout the hierarchy.

parent 03812618
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
eeschema/netlist.cpp
View file @ 10ded82d
...@@ -1098,16 +1098,16 @@ static void LabelConnect( ObjetNetListStruct* LabelRef ) ...@@ -1098,16 +1098,16 @@ static void LabelConnect( ObjetNetListStruct* LabelRef )
if( netTable[i].m_SheetList != LabelRef->m_SheetList ) if( netTable[i].m_SheetList != LabelRef->m_SheetList )
{ {
if( netTable[i].m_Type != NET_LABEL // (***) if( netTable[i].m_Type != NET_PINLABEL
&& netTable[i].m_Type != NET_PINLABEL
&& netTable[i].m_Type != NET_GLOBLABEL && netTable[i].m_Type != NET_GLOBLABEL
&& netTable[i].m_Type != NET_GLOBBUSLABELMEMBER) && netTable[i].m_Type != NET_GLOBBUSLABELMEMBER
/*netTable[i].m_Type != NET_LABEL (***)*/ )
continue; continue;
} }
//regular labels are sheet-local; //regular labels are sheet-local;
//NET_HIERLABEL are used to connect sheets. //NET_HIERLABEL are used to connect sheets.
//NET_LABEL can be either sheet-local or global. //NET_LABEL is sheet-local (***)
//historically, it was global, so we must implement that (***) //NET_GLOBLABEL is global.
if( netTable[i].m_Type == NET_LABEL if( netTable[i].m_Type == NET_LABEL
|| netTable[i].m_Type == NET_GLOBLABEL || netTable[i].m_Type == NET_GLOBLABEL
|| netTable[i].m_Type == NET_BUSLABELMEMBER || netTable[i].m_Type == NET_BUSLABELMEMBER
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment