electron-rare/kicad-source-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check secondary driver names when merging

Browse Source 
If two nets are joined by a global power pin but both have global labels
that override the net name, we still want them to be merged.  This
checks for all net names in the drivers when looking for subgraph
merging candidates

Fixes https://gitlab.com/kicad/code/kicad/-/issues/18092
This commit is contained in:
Seth Hillbrand
2024-12-10 15:54:47 -08:00
parent 937d8c9541
commit ad985aff9d
7 changed files with 2147 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eeschema/connection_graph.cpp
+11 -10
View File
@@ -2026,7 +2026,7 @@ void CONNECTION_GRAPH::processSubGraphs()
subgraph->m_bus_neighbors[member].insert( candidate );
candidate->m_bus_parents[member].insert( subgraph );
}
else if( connection->Type() == candidate->m_driver_connection->Type() )
else if( !connection->IsBus() || connection->Type() == candidate->m_driver_connection->Type() )
{
wxLogTrace( ConnTrace, wxS( "%lu (%s) absorbs neighbor %lu (%s)" ),
subgraph->m_code, connection->Name(),
@@ -2184,18 +2184,19 @@ void CONNECTION_GRAPH::buildConnectionGraph( std::function<void( SCH_ITEM* )>* a
if( !secondary_is_global && candidate->m_sheet != subgraph->m_sheet )
continue;
SCH_CONNECTION* conn = candidate->m_driver_connection;
if( conn->Name() == secondary_name )
for( SCH_ITEM* candidate_driver : candidate->m_drivers )
{
wxLogTrace( ConnTrace, wxS( "Global %lu (%s) promoted to %s" ),
candidate->m_code, conn->Name(),
subgraph->m_driver_connection->Name() );
if( candidate->GetNameForDriver( candidate_driver ) == secondary_name )
{
wxLogTrace( ConnTrace, wxS( "Global %lu (%s) promoted to %s" ),
candidate->m_code, candidate->m_driver_connection->Name(),
subgraph->m_driver_connection->Name() );
conn->Clone( *subgraph->m_driver_connection );
candidate->m_driver_connection->Clone( *subgraph->m_driver_connection );
candidate->m_dirty = false;
propagateToNeighbors( candidate, false );
candidate->m_dirty = false;
propagateToNeighbors( candidate, false );
}
}
}
}
qa/data/eeschema/issue18092/issue18092.kicad_pro
+1293
View File
File diff suppressed because it is too large Load Diff
qa/data/eeschema/issue18092/issue18092.kicad_sch
+259
View File
@@ -0,0 +1,259 @@
(kicad_sch
(version 20231120)
(generator "eeschema")
(generator_version "8.0")
(uuid "617edc57-1dbf-4296-b365-6d76f68a1c0f")
(paper "A4")
(lib_symbols
(symbol "0_Power:3V3_MM"
(power)
(pin_names
(offset 0)
)
(exclude_from_sim no)
(in_bom yes)
(on_board yes)
(property "Reference" "#PWR"
(at 0 -3.81 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "Value" "3V3_MM"
(at 0 3.556 0)
(effects
(font
(size 1.27 1.27)
)
)
)
(property "Footprint" ""
(at 0 0 0)
(effects
(font
(size 1.524 1.524)
)
(hide yes)
)
)
(property "Datasheet" ""
(at 0 0 0)
(effects
(font
(size 1.524 1.524)
)
(hide yes)
)
)
(property "Description" ""
(at 0 0 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "ki_keywords" "POWER, PWR"
(at 0 0 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(symbol "3V3_MM_0_1"
(polyline
(pts
(xy 0 0) (xy 0 1.27)
)
(stroke
(width 0.1778)
(type default)
)
(fill
(type none)
)
)
(polyline
(pts
(xy -0.635 1.27) (xy 0.635 1.27) (xy 0 2.54) (xy -0.635 1.27)
)
(stroke
(width 0.254)
(type default)
)
(fill
(type none)
)
)
)
(symbol "3V3_MM_1_1"
(pin power_in line
(at 0 0 90)
(length 0) hide
(name "3V3_MM"
(effects
(font
(size 1.27 1.27)
)
)
)
(number "1"
(effects
(font
(size 1.27 1.27)
)
)
)
)
)
)
)
(global_label "AOP_VCC"
(shape tri_state)
(at 73.66 13.97 0)
(fields_autoplaced yes)
(effects
(font
(size 1.27 1.27)
)
(justify left)
)
(uuid "21589963-6016-46c8-b57e-7724f9c99970")
(property "Intersheetrefs" "${INTERSHEET_REFS}"
(at 85.2288 13.97 0)
(effects
(font
(size 1.27 1.27)
)
(justify left)
(hide yes)
)
)
(property "Références Inter-Feuilles" "${INTERSHEET_REFS}"
(at 73.66 15.8052 0)
(effects
(font
(size 1.27 1.27)
)
(justify left)
(hide yes)
)
)
)
(symbol
(lib_id "0_Power:3V3_MM")
(at 73.66 13.97 90)
(unit 1)
(exclude_from_sim no)
(in_bom yes)
(on_board yes)
(dnp no)
(fields_autoplaced yes)
(uuid "cb3ce4bd-6991-4e3e-b715-a5a49f5b8b78")
(property "Reference" "#PWR013"
(at 77.47 13.97 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "Value" "3V3_MM"
(at 70.358 13.97 90)
(effects
(font
(size 1.27 1.27)
)
(justify left)
)
)
(property "Footprint" ""
(at 73.66 13.97 0)
(effects
(font
(size 1.524 1.524)
)
(hide yes)
)
)
(property "Datasheet" ""
(at 73.66 13.97 0)
(effects
(font
(size 1.524 1.524)
)
(hide yes)
)
)
(property "Description" ""
(at 73.66 13.97 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(pin "1"
(uuid "a76fe4e2-c21a-42f7-ac21-158f59e7ac90")
)
(instances
(project "UCV6_P_Screen"
(path "/617edc57-1dbf-4296-b365-6d76f68a1c0f"
(reference "#PWR013")
(unit 1)
)
)
)
)
(sheet
(at 64.77 27.94)
(size 12.7 10.16)
(fields_autoplaced yes)
(stroke
(width 0.1524)
(type solid)
)
(fill
(color 0 0 0 0.0000)
)
(uuid "a366c673-60aa-4d10-a4e6-ea317da8a798")
(property "Sheetname" "sub_18092"
(at 64.77 27.2284 0)
(effects
(font
(size 1.27 1.27)
)
(justify left bottom)
)
)
(property "Sheetfile" "sub_18092.kicad_sch"
(at 64.77 38.6846 0)
(effects
(font
(size 1.27 1.27)
)
(justify left top)
)
)
(instances
(project "UCV6_P_Screen"
(path "/617edc57-1dbf-4296-b365-6d76f68a1c0f"
(page "39")
)
)
)
)
(sheet_instances
(path "/"
(page "1")
)
)
)
qa/data/eeschema/issue18092/sub_18092.kicad_sch
+516
View File
@@ -0,0 +1,516 @@
(kicad_sch
(version 20231120)
(generator "eeschema")
(generator_version "8.0")
(uuid "468691ae-fbea-486a-acab-abdd40c402ea")
(paper "A4")
(lib_symbols
(symbol "0_Power:3V3_MM"
(power)
(pin_names
(offset 0)
)
(exclude_from_sim no)
(in_bom yes)
(on_board yes)
(property "Reference" "#PWR"
(at 0 -3.81 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "Value" "3V3_MM"
(at 0 3.556 0)
(effects
(font
(size 1.27 1.27)
)
)
)
(property "Footprint" ""
(at 0 0 0)
(effects
(font
(size 1.524 1.524)
)
(hide yes)
)
)
(property "Datasheet" ""
(at 0 0 0)
(effects
(font
(size 1.524 1.524)
)
(hide yes)
)
)
(property "Description" ""
(at 0 0 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "ki_keywords" "POWER, PWR"
(at 0 0 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(symbol "3V3_MM_0_1"
(polyline
(pts
(xy 0 0) (xy 0 1.27)
)
(stroke
(width 0.1778)
(type default)
)
(fill
(type none)
)
)
(polyline
(pts
(xy -0.635 1.27) (xy 0.635 1.27) (xy 0 2.54) (xy -0.635 1.27)
)
(stroke
(width 0.254)
(type default)
)
(fill
(type none)
)
)
)
(symbol "3V3_MM_1_1"
(pin power_in line
(at 0 0 90)
(length 0) hide
(name "3V3_MM"
(effects
(font
(size 1.27 1.27)
)
)
)
(number "1"
(effects
(font
(size 1.27 1.27)
)
)
)
)
)
)
(symbol "Connector:TestPoint"
(pin_numbers hide)
(pin_names
(offset 0.762) hide)
(exclude_from_sim no)
(in_bom yes)
(on_board yes)
(property "Reference" "TP"
(at 0 6.858 0)
(effects
(font
(size 1.27 1.27)
)
)
)
(property "Value" "TestPoint"
(at 0 5.08 0)
(effects
(font
(size 1.27 1.27)
)
)
)
(property "Footprint" ""
(at 5.08 0 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "Datasheet" "~"
(at 5.08 0 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "Description" "test point"
(at 0 0 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "ki_keywords" "test point tp"
(at 0 0 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "ki_fp_filters" "Pin* Test*"
(at 0 0 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(symbol "TestPoint_0_1"
(circle
(center 0 3.302)
(radius 0.762)
(stroke
(width 0)
(type default)
)
(fill
(type none)
)
)
)
(symbol "TestPoint_1_1"
(pin passive line
(at 0 0 90)
(length 2.54)
(name "1"
(effects
(font
(size 1.27 1.27)
)
)
)
(number "1"
(effects
(font
(size 1.27 1.27)
)
)
)
)
)
)
)
(global_label "AOP_VCC"
(shape tri_state)
(at 50.8 64.77 0)
(fields_autoplaced yes)
(effects
(font
(size 1.27 1.27)
)
(justify left)
)
(uuid "5a21f415-1360-4670-bcce-17448a333e36")
(property "Intersheetrefs" "${INTERSHEET_REFS}"
(at 62.3688 64.77 0)
(effects
(font
(size 1.27 1.27)
)
(justify left)
(hide yes)
)
)
(property "Références Inter-Feuilles" "${INTERSHEET_REFS}"
(at 50.8 66.6052 0)
(effects
(font
(size 1.27 1.27)
)
(justify left)
(hide yes)
)
)
)
(global_label "MM_SCREEN_CAP_VCC"
(shape tri_state)
(at 35.56 64.77 180)
(fields_autoplaced yes)
(effects
(font
(size 1.27 1.27)
)
(justify right)
)
(uuid "8100a8a1-f746-4da7-b635-14a04ad989ee")
(property "Intersheetrefs" "${INTERSHEET_REFS}"
(at 11.8357 64.77 0)
(effects
(font
(size 1.27 1.27)
)
(justify right)
(hide yes)
)
)
(property "Références Inter-Feuilles" "${INTERSHEET_REFS}"
(at 35.56 66.6052 0)
(effects
(font
(size 1.27 1.27)
)
(justify right)
(hide yes)
)
)
)
(global_label "MM_SCREEN_CAP_VCC"
(shape tri_state)
(at 38.1 81.28 0)
(fields_autoplaced yes)
(effects
(font
(size 1.27 1.27)
)
(justify left)
)
(uuid "e9fabeee-1c39-47b3-8ca5-3b7e259ede66")
(property "Intersheetrefs" "${INTERSHEET_REFS}"
(at 61.8243 81.28 0)
(effects
(font
(size 1.27 1.27)
)
(justify left)
(hide yes)
)
)
(property "Références Inter-Feuilles" "${INTERSHEET_REFS}"
(at 38.1 83.1152 0)
(effects
(font
(size 1.27 1.27)
)
(justify left)
(hide yes)
)
)
)
(symbol
(lib_id "Connector:TestPoint")
(at 50.8 64.77 0)
(unit 1)
(exclude_from_sim no)
(in_bom yes)
(on_board yes)
(dnp no)
(fields_autoplaced yes)
(uuid "694a310f-f39f-4032-bf7f-6fee3672a5d3")
(property "Reference" "TP2"
(at 53.34 60.1979 0)
(effects
(font
(size 1.27 1.27)
)
(justify left)
)
)
(property "Value" "TestPoint"
(at 53.34 62.7379 0)
(effects
(font
(size 1.27 1.27)
)
(justify left)
)
)
(property "Footprint" ""
(at 55.88 64.77 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "Datasheet" "~"
(at 55.88 64.77 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "Description" "test point"
(at 50.8 64.77 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(pin "1"
(uuid "c6e8886c-1a06-4142-8859-6f1b6f3e51ac")
)
(instances
(project "UCV6_P_Screen"
(path "/617edc57-1dbf-4296-b365-6d76f68a1c0f/a366c673-60aa-4d10-a4e6-ea317da8a798"
(reference "TP2")
(unit 1)
)
)
)
)
(symbol
(lib_id "Connector:TestPoint")
(at 35.56 64.77 0)
(unit 1)
(exclude_from_sim no)
(in_bom yes)
(on_board yes)
(dnp no)
(fields_autoplaced yes)
(uuid "a86f8f42-2efa-436c-b423-a04b69d9e050")
(property "Reference" "TP1"
(at 38.1 60.1979 0)
(effects
(font
(size 1.27 1.27)
)
(justify left)
)
)
(property "Value" "TestPoint"
(at 38.1 62.7379 0)
(effects
(font
(size 1.27 1.27)
)
(justify left)
)
)
(property "Footprint" ""
(at 40.64 64.77 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "Datasheet" "~"
(at 40.64 64.77 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "Description" "test point"
(at 35.56 64.77 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(pin "1"
(uuid "0ba270a4-888e-4a40-9f1a-6a476f6825c4")
)
(instances
(project "UCV6_P_Screen"
(path "/617edc57-1dbf-4296-b365-6d76f68a1c0f/a366c673-60aa-4d10-a4e6-ea317da8a798"
(reference "TP1")
(unit 1)
)
)
)
)
(symbol
(lib_id "0_Power:3V3_MM")
(at 38.1 81.28 90)
(unit 1)
(exclude_from_sim no)
(in_bom yes)
(on_board yes)
(dnp no)
(fields_autoplaced yes)
(uuid "c21f5b8c-5d37-4dc9-8550-7b3b9ab0ac8e")
(property "Reference" "#PWR0957"
(at 41.91 81.28 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(property "Value" "3V3_MM"
(at 34.798 81.28 90)
(effects
(font
(size 1.27 1.27)
)
(justify left)
)
)
(property "Footprint" ""
(at 38.1 81.28 0)
(effects
(font
(size 1.524 1.524)
)
(hide yes)
)
)
(property "Datasheet" ""
(at 38.1 81.28 0)
(effects
(font
(size 1.524 1.524)
)
(hide yes)
)
)
(property "Description" ""
(at 38.1 81.28 0)
(effects
(font
(size 1.27 1.27)
)
(hide yes)
)
)
(pin "1"
(uuid "01775cdd-034e-434f-9038-8228a32df11d")
)
(instances
(project "UCV6_P_Screen"
(path "/617edc57-1dbf-4296-b365-6d76f68a1c0f/a366c673-60aa-4d10-a4e6-ea317da8a798"
(reference "#PWR0957")
(unit 1)
)
)
)
)
)
qa/tests/eeschema/CMakeLists.txt
+1
View File
@@ -62,6 +62,7 @@ set( QA_EESCHEMA_SRCS
erc/test_erc_label_multiple_wires.cpp
erc/test_erc_unconnected_wire_endpoints.cpp
test_connectivity_algo.cpp
test_eagle_plugin.cpp
test_junction_helpers.cpp
test_lib_part.cpp
qa/tests/eeschema/test_connectivity_algo.cpp
+64
View File
@@ -0,0 +1,64 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2024 KiCad Developers, see AUTHORS.TXT for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 3
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* https://www.gnu.org/licenses/gpl-3.0.en.html
* or you may search the http://www.gnu.org website for the version 32 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <qa_utils/wx_utils/unit_test_utils.h>
#include <schematic_utils/schematic_file_util.h>
#include <connection_graph.h>
#include <schematic.h>
#include <sch_sheet.h>
#include <sch_screen.h>
#include <settings/settings_manager.h>
#include <locale_io.h>
struct CONNECTIVITY_TEST_FIXTURE
{
CONNECTIVITY_TEST_FIXTURE() :
m_settingsManager( true /* headless */ )
{ }
SETTINGS_MANAGER m_settingsManager;
std::unique_ptr<SCHEMATIC> m_schematic;
};
BOOST_FIXTURE_TEST_CASE( CheckNetCounts, CONNECTIVITY_TEST_FIXTURE )
{
LOCALE_IO dummy;
std::vector<std::pair<wxString, int>> tests =
{
{ "issue18092/issue18092", 1 }
};
for( auto&[ name, nets] : tests )
{
KI_TEST::LoadSchematic( m_settingsManager, name, m_schematic );
SCH_SHEET_LIST sheets = m_schematic->BuildSheetListSortedByPageNumbers();
CONNECTION_GRAPH* graph = m_schematic->ConnectionGraph();
BOOST_CHECK( nets == graph->GetNetMap().size() );
}
}
qa/tests/eeschema/test_incremental_netlister.cpp
+3 -3
View File
@@ -32,9 +32,9 @@
#include <settings/settings_manager.h>
#include <locale_io.h>
struct INCREMENTAL_NETLIST_TEST_FIXTURE
struct CONNECTIVITY_TEST_FIXTURE
{
INCREMENTAL_NETLIST_TEST_FIXTURE() :
CONNECTIVITY_TEST_FIXTURE() :
m_settingsManager( true /* headless */ )
{ }
@@ -42,7 +42,7 @@ struct INCREMENTAL_NETLIST_TEST_FIXTURE
std::unique_ptr<SCHEMATIC> m_schematic;
};
BOOST_FIXTURE_TEST_CASE( RemoveAddItems, INCREMENTAL_NETLIST_TEST_FIXTURE )
BOOST_FIXTURE_TEST_CASE( RemoveAddItems, CONNECTIVITY_TEST_FIXTURE )
{
LOCALE_IO dummy;